>From 5307243bee83f4cd4d70aee42b273a9d27115d7d Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 17 Jun 2015 15:50:31 -0700 Subject: [PATCH] s3: smbd - Fix SMB3.11 protocol encryption selection. Selecting encryption in 3.11 depends on the negprot contexts being present. Setting SMB2_CAP_ENCRYPTION from the 3.11 client is optional. The absence of it should not remove the negprot context. Found by the Microsoft testsuites at the Redmond plugfest. Signed-off-by: Jeremy Allison --- source3/smbd/smb2_negprot.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c index 63bac9e..3106ef3 100644 --- a/source3/smbd/smb2_negprot.c +++ b/source3/smbd/smb2_negprot.c @@ -414,10 +414,6 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req) req->preauth = &req->xconn->smb2.preauth; } - if (!(capabilities & SMB2_CAP_ENCRYPTION)) { - in_cipher = NULL; - } - if (in_cipher != NULL) { size_t needed = 2; uint16_t cipher_count; -- 2.1.4