[SCM] Samba Shared Repository - branch master updated

Jeremy Allison jra at samba.org
Wed Jun 17 20:10:07 MDT 2015


The branch, master has been updated
       via  cd57075 s3: smbd - Fix SMB3.11 protocol encryption selection.
      from  db59f9e selftest: Change chgdcpass environment to use winbindd

https://git.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit cd570757c8335b89d3f23727345758c336d45e7b
Author: Jeremy Allison <jra at samba.org>
Date:   Wed Jun 17 15:50:31 2015 -0700

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

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

Summary of changes:
 source3/smbd/smb2_negprot.c | 4 ----
 1 file changed, 4 deletions(-)


Changeset truncated at 500 lines:

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;


-- 
Samba Shared Repository


More information about the samba-cvs mailing list