libcli/smb: add PROTOCOL_SMB3_11 and SMB3_DIALECT_REVISION_311

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Michael Adam <obnox@samba.org>

diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index e98d18332ce65d80dd4fca7467ec19a6bee13082..cb2f40b260bea75572f97b2dc7840d9a8016f7bd 100644 (file)
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -470,8 +470,11 @@ chmod 1770 /usr/local/samba/lib/usershares
                
                <varlistentry>
                <term>%R</term>
-               <listitem><para>the selected protocol level after protocol negotiation. It can be one of CORE, COREPLUS, 
-                       LANMAN1, LANMAN2, NT1, SMB2_02, SMB2_10, SMB2_22, SMB2_24, SMB3_00, SMB3_02, SMB3_10 or SMB2_FF.</para></listitem>
+               <listitem><para>the selected protocol level after protocol negotiation. It can be one of
+                       CORE, COREPLUS, LANMAN1, LANMAN2, NT1,
+                       SMB2_02, SMB2_10, SMB2_22, SMB2_24,
+                       SMB3_00, SMB3_02, SMB3_10, SMB3_11
+                       or SMB2_FF.</para></listitem>
                </varlistentry>
 
                <varlistentry>

diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 1b1681478c359d41b48f0aeb7d5ddfe6aa61b398..1ca9b93667ae0026fa622c2092d8c57d850eb8eb 100644 (file)
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -64,7 +64,10 @@
                    <para><constant>SMB3_02</constant>: Windows 8.1 SMB3 version.</para>
                </listitem>
                <listitem>
-                   <para><constant>SMB3_10</constant>: Windows 10 technical preview SMB3 version.</para>
+                   <para><constant>SMB3_10</constant>: early Windows 10 technical preview SMB3 version.</para>
+               </listitem>
+               <listitem>
+                   <para><constant>SMB3_11</constant>: Windows 10 technical preview SMB3 version (maybe final).</para>
                </listitem>
            </itemizedlist>
            <para>By default SMB3 selects the SMB3_00 variant.</para>

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index eede823273ea0e8a03351da114b625b852e40994..9b806393e02fcf8613e10a5f6ecfa9716dc4814e 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -41,6 +41,7 @@ static const struct enum_list enum_protocol[] = {
        {PROTOCOL_DEFAULT, "default"}, /* the caller decides what this means */
        {PROTOCOL_SMB2_10, "SMB2"}, /* for now keep PROTOCOL_SMB2_10 */
        {PROTOCOL_SMB3_00, "SMB3"}, /* for now keep PROTOCOL_SMB3_00 */
+       {PROTOCOL_SMB3_11, "SMB3_11"},
        {PROTOCOL_SMB3_10, "SMB3_10"},
        {PROTOCOL_SMB3_02, "SMB3_02"},
        {PROTOCOL_SMB3_00, "SMB3_00"},

diff --git a/libcli/smb/smb2_constants.h b/libcli/smb/smb2_constants.h
index baee847b10d8a74f527985a45115fb784cd92855..1e4248d92e3b062f48dda8a2513fb3ad2ea01b74 100644 (file)
--- a/libcli/smb/smb2_constants.h
+++ b/libcli/smb/smb2_constants.h
@@ -98,6 +98,7 @@
 #define SMB3_DIALECT_REVISION_300       0x0300
 #define SMB3_DIALECT_REVISION_302       0x0302
 #define SMB3_DIALECT_REVISION_310       0x0310
+#define SMB3_DIALECT_REVISION_311       0x0311
 #define SMB2_DIALECT_REVISION_2FF       0x02FF
 
 /* SMB2 negotiate security_mode */

diff --git a/libcli/smb/smbXcli_base.c b/libcli/smb/smbXcli_base.c
index 4ab22b6fcb8063191d1383c30ac6a37669017add..d4eedd905f10b616e338d0ff3b4f623ef8cf1a56 100644 (file)
--- a/libcli/smb/smbXcli_base.c
+++ b/libcli/smb/smbXcli_base.c
@@ -3799,6 +3799,7 @@ static const struct {
        {PROTOCOL_SMB3_00,      SMB3_DIALECT_REVISION_300},
        {PROTOCOL_SMB3_02,      SMB3_DIALECT_REVISION_302},
        {PROTOCOL_SMB3_10,      SMB3_DIALECT_REVISION_310},
+       {PROTOCOL_SMB3_11,      SMB3_DIALECT_REVISION_311},
 };
 
 struct smbXcli_negprot_state {

diff --git a/libcli/smb/smb_constants.h b/libcli/smb/smb_constants.h
index 5d494f4b1efeabf5c1598ab51e8eb367bf88954d..bfbde7402747e8571f832f9734cbc530d0af6b5c 100644 (file)
--- a/libcli/smb/smb_constants.h
+++ b/libcli/smb/smb_constants.h
@@ -89,9 +89,10 @@ enum protocol_types {
        PROTOCOL_SMB2_24,
        PROTOCOL_SMB3_00,
        PROTOCOL_SMB3_02,
-       PROTOCOL_SMB3_10
+       PROTOCOL_SMB3_10,
+       PROTOCOL_SMB3_11
 };
-#define PROTOCOL_LATEST PROTOCOL_SMB3_10
+#define PROTOCOL_LATEST PROTOCOL_SMB3_11
 
 enum smb_signing_setting {
        SMB_SIGNING_DEFAULT = -1,