s3:smb2_negprot: add support for negotiating SMB 3.1.0 and SMB 3.1.1

Note: SMB 3.1.0 was used in a early preview versions of Windows 10.
Was later superseded by 3.1.1.

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

diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 66bc3f8da5b14eba169985ab6ccb2f3bb84fad5d..33a49ccc4e443a08a55b93cf15208f76a8807e3c 100644 (file)
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -52,6 +52,12 @@
                <listitem>
                    <para><constant>SMB3_02</constant>: Windows 8.1 SMB3 version.</para>
                </listitem>
+               <listitem>
+                   <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_02 variant.</para>
        </listitem>

diff --git a/source3/smbd/smb2_negprot.c b/source3/smbd/smb2_negprot.c
index 199dc147ab630aa1fac49c54c97fecd8417cedac..63bac9ef8197af232546a17f84873bb065d072f4 100644 (file)
--- a/source3/smbd/smb2_negprot.c
+++ b/source3/smbd/smb2_negprot.c
@@ -92,6 +92,8 @@ enum protocol_types smbd_smb2_protocol_dialect_match(const uint8_t *indyn,
                enum protocol_types proto;
                uint16_t dialect;
        } pd[] = {
+               { PROTOCOL_SMB3_11, SMB3_DIALECT_REVISION_311 },
+               { PROTOCOL_SMB3_10, SMB3_DIALECT_REVISION_310 },
                { PROTOCOL_SMB3_02, SMB3_DIALECT_REVISION_302 },
                { PROTOCOL_SMB3_00, SMB3_DIALECT_REVISION_300 },
                { PROTOCOL_SMB2_24, SMB2_DIALECT_REVISION_224 },