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 <jra@samba.org>
Reviewed-by: Steve French <sfrench@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu Jun 18 04:09:04 CEST 2015 on sn-devel-104

diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index 63bac9ef8197af232546a17f84873bb065d072f4..3106ef38c7a99bf1d24c50bc5f90359dbf01e71f 100644 (file)
--- 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;