[SCM] Samba Shared Repository - branch v3-2-test updated - initial-v3-2-unstable-1202-g647f13d

[Jeremy Allison]

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

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


- Log -----------------------------------------------------------------
commit 647f13d0f1a270a68263b3b0403436f9d6cf1a0e
Author: Jeremy Allison <jra at samba.org>
Date:   Tue Jan 8 15:57:08 2008 -0800

    Correctly identify enc/non-enc packets.
    Jeremy.

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

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


Changeset truncated at 500 lines:

diff --git a/source/smbd/seal.c b/source/smbd/seal.c
index 21fca73..51a5f23 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. */
-	if(CVAL(inbuf,0)) {
+	/* Ignore non-session messages or 0xFF'SMB' messages. */
+	if(CVAL(inbuf,0) || IVAL(inbuf,4) == 0x424d53ff) {
 		return false;
 	}
 
@@ -63,7 +63,9 @@ bool is_encrypted_packet(const uint8_t *inbuf)
 		return false;
 	}
 
-	if (srv_trans_enc_ctx && enc_num == srv_enc_ctx()) {
+	if (SVAL(inbuf,4) == 0x45FF &&
+			srv_trans_enc_ctx &&
+			enc_num == srv_enc_ctx()) {
 		return true;
 	}
 	return false;


-- 
Samba Shared Repository