s3:smb2_negprot: annouce/negotiate SMB3 encryption support
authorStefan Metzmacher <metze@samba.org>
Wed, 8 Aug 2012 05:07:53 +0000 (07:07 +0200)
committerStefan Metzmacher <metze@samba.org>
Fri, 17 Aug 2012 12:51:57 +0000 (14:51 +0200)
metze

source3/smbd/smb2_negprot.c

index d086566d5cc6adc797fa5a5ea3e9af68cd359c39..11ec2a5eff4dda7ac65159bface61ffbc22e887a 100644 (file)
@@ -254,6 +254,14 @@ NTSTATUS smbd_smb2_request_process_negprot(struct smbd_smb2_request *req)
                capabilities |= SMB2_CAP_DFS;
        }
 
+       if ((protocol >= PROTOCOL_SMB2_24) &&
+           (lp_smb_encrypt(-1) != SMB_SIGNING_OFF))
+       {
+               if (in_capabilities & SMB2_CAP_ENCRYPTION) {
+                       capabilities |= SMB2_CAP_ENCRYPTION;
+               }
+       }
+
        /*
         * 0x10000 (65536) is the maximum allowed message size
         * for SMB 2.0