summaryrefslogtreecommitdiff
path: root/source3
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2012-08-08 07:07:53 +0200
committerStefan Metzmacher <metze@samba.org>2012-08-17 14:51:57 +0200
commit45471f4d8f80d80c01197536bcf47d932dcd38e0 (patch)
tree7e6155bfc43c1ef3f7582fae63c4f6d471d51f8c /source3
parent9397d6709f79f2e8837401d32cd7ac584b6c5b24 (diff)
downloadsamba-45471f4d8f80d80c01197536bcf47d932dcd38e0.tar.gz
samba-45471f4d8f80d80c01197536bcf47d932dcd38e0.tar.bz2
samba-45471f4d8f80d80c01197536bcf47d932dcd38e0.zip
s3:smb2_negprot: annouce/negotiate SMB3 encryption support
metze
Diffstat (limited to 'source3')
-rw-r--r--source3/smbd/smb2_negprot.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index d086566d5c..11ec2a5eff 100644
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -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