summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorJeremy Allison <jra@samba.org>2008-01-08 15:57:08 -0800
committerJeremy Allison <jra@samba.org>2008-01-08 15:57:08 -0800
commit80158198eee90cf05396989df068f77f8bb7e064 (patch)
tree799fd2aa5e5ea815ef7bc6336d326eb90e1b9bd1 /source3
parent148f1eee4338bbe485f9b9bcf9569f76f906b665 (diff)
downloadsamba-80158198eee90cf05396989df068f77f8bb7e064.tar.gz
samba-80158198eee90cf05396989df068f77f8bb7e064.tar.bz2
samba-80158198eee90cf05396989df068f77f8bb7e064.zip
Correctly identify enc/non-enc packets.
Jeremy. (This used to be commit 647f13d0f1a270a68263b3b0403436f9d6cf1a0e)
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/seal.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/source3/smbd/seal.c b/source3/smbd/seal.c
index 21fca73fea..51a5f23f03 100644
--- a/source3/smbd/seal.c
+++ b/source3/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;