From: Stefan Metzmacher <metze@samba.org>
Date: Wed, 8 Aug 2012 05:07:53 +0000 (+0200)
Subject: s3:smb2_negprot: annouce/negotiate SMB3 encryption support
X-Git-Tag: samba-4.0.0beta7~150
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=45471f4d8f80d80c01197536bcf47d932dcd38e0;p=thirdparty%2Fsamba.git

s3:smb2_negprot: annouce/negotiate SMB3 encryption support

metze
---

diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index d086566d5cc..11ec2a5eff4 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