[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1203-gbedc493

[Jeremy Allison]

The branch, v3-2-test has been updated
       via  bedc493874adaf783362ba7b821e2a6d985b96ea (commit)
      from  647f13d0f1a270a68263b3b0403436f9d6cf1a0e (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit bedc493874adaf783362ba7b821e2a6d985b96ea
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 8 16:08:39 2008 -0800

    Simplify... plus add a debug message.
    Jeremy.

-----------------------------------------------------------------------

Summary of changes:
 source/smbd/seal.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/smbd/seal.c b/source/smbd/seal.c
index 51a5f23..ea017e0 100644
--- a/source/smbd/seal.c
+++ b/source/smbd/seal.c
@@ -53,8 +53,8 @@ bool is_encrypted_packet(const uint8_t *inbuf)
 	NTSTATUS status;
 	uint16_t enc_num;
 
-	/* Ignore non-session messages or 0xFF'SMB' messages. */
-	if(CVAL(inbuf,0) || IVAL(inbuf,4) == 0x424d53ff) {
+	/* Ignore non-session messages or non 0xFF'E' messages. */
+	if(CVAL(inbuf,0) || !(inbuf[4] == 0xFF && inbuf[5] == 'E')) {
 		return false;
 	}
 
@@ -63,9 +63,8 @@ bool is_encrypted_packet(const uint8_t *inbuf)
 		return false;
 	}
 
-	if (SVAL(inbuf,4) == 0x45FF &&
-			srv_trans_enc_ctx &&
-			enc_num == srv_enc_ctx()) {
+	/* Encrypted messages are 0xFF'E'<ctx> */
+	if (srv_trans_enc_ctx && enc_num == srv_enc_ctx()) {
 		return true;
 	}
 	return false;
@@ -714,6 +713,7 @@ NTSTATUS srv_encryption_start(connection_struct *conn)
 
 	partial_srv_trans_enc_ctx = NULL;
 
+	DEBUG(1,("srv_encryption_start: context negotiated\n"));
 	return NT_STATUS_OK;
 }
 


-- 
Samba Shared Repository