docs-xml: remove support for "SMB3_10"

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml
index 888771cdc9c8f791db6241dbf3e9a9a6ea336914..72664a2e4572376aafae0681ba48d20e6dd516e1 100644 (file)
--- a/docs-xml/manpages/smb.conf.5.xml
+++ b/docs-xml/manpages/smb.conf.5.xml
@@ -504,7 +504,7 @@ chmod 1770 /usr/local/samba/lib/usershares
                <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, SMB3_00, SMB3_02, SMB3_10, SMB3_11
+                       SMB2_02, SMB2_10, SMB3_00, SMB3_02, SMB3_11
                        or SMB2_FF.</para></listitem>
                </varlistentry>
 

diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
index 16b406157925eb64d90980e4307a037250b666d3..784123ecadf6e84a79af8f1142a9d8e90394f3e4 100644 (file)
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -59,10 +59,7 @@
                    <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>
+                   <para><constant>SMB3_11</constant>: Windows 10 SMB3 version.</para>
                </listitem>
            </itemizedlist>
            <para>By default SMB3 selects the SMB3_11 variant.</para>

diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index c573c73966aef0d1c9dead02fa3f6a87fd92bb7e..815841d6001733e05597bce1b02fc2cc7ee6b3eb 100644 (file)
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -48,10 +48,7 @@
                    <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>
+                   <para><constant>SMB3_11</constant>: Windows 10 SMB3 version.</para>
                </listitem>
            </itemizedlist>
            <para>By default SMB3 selects the SMB3_11 variant.</para>

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index d4d372240bcea40b2f8c00a2e27c561d8d50f984..d9301152d94c3e8e5cb6671ef77501e5a8300bff 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -46,7 +46,6 @@ static const struct enum_list enum_protocol[] = {
        {PROTOCOL_SMB2_10, "SMB2"}, /* for now keep PROTOCOL_SMB2_10 */
        {PROTOCOL_SMB3_11, "SMB3"}, /* for now keep PROTOCOL_SMB3_11 */
        {PROTOCOL_SMB3_11, "SMB3_11"},
-       {PROTOCOL_SMB3_10, "SMB3_10"},
        {PROTOCOL_SMB3_02, "SMB3_02"},
        {PROTOCOL_SMB3_00, "SMB3_00"},
        {PROTOCOL_SMB2_10, "SMB2_10"},

diff --git a/libgpo/admx/en-US/samba.adml b/libgpo/admx/en-US/samba.adml
index df07c805c9d11ff5497ad54fc39bf3c6ec3b9312..a954c41a7d07c6a581d74515f2da19bd6188a301 100755 (executable)
--- a/libgpo/admx/en-US/samba.adml
+++ b/libgpo/admx/en-US/samba.adml
@@ -1200,7 +1200,7 @@ Example: SMB3_11</string>
  LANMAN2: Updates to Lanman1 protocol.\r
  NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS.\r
  SMB2: Re-implementation of the SMB protocol. Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available.     SMB2_02: The earliest SMB2 version.       SMB2_10: Windows 7 SMB2 version.       By default SMB2 selects the SMB2_10 variant.
- SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available.     SMB3_00: Windows 8 SMB3 version.       SMB3_02: Windows 8.1 SMB3 version.       SMB3_10: early Windows 10 technical preview SMB3 version.       SMB3_11: Windows 10 technical preview SMB3 version (maybe final).   By default SMB3 selects the SMB3_11 variant.
+ SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available.     SMB3_00: Windows 8 SMB3 version.       SMB3_02: Windows 8.1 SMB3 version.       SMB3_11: Windows 10 SMB3 version.   By default SMB3 selects the SMB3_11 variant.
 \r
 \r
  Normally this option should not be set as the automatic\r
@@ -1388,7 +1388,7 @@ In general this parameter should be viewed as a system tuning tool and left seve
  LANMAN2: Updates to Lanman1 protocol.\r
  NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS.\r
  SMB2: Re-implementation of the SMB protocol. Used by Windows Vista and later versions of Windows. SMB2 has sub protocols available.     SMB2_02: The earliest SMB2 version.       SMB2_10: Windows 7 SMB2 version.       By default SMB2 selects the SMB2_10 variant.
- SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available.     SMB3_00: Windows 8 SMB3 version.       SMB3_02: Windows 8.1 SMB3 version.       SMB3_10: early Windows 10 technical preview SMB3 version.       SMB3_11: Windows 10 technical preview SMB3 version (maybe final).   By default SMB3 selects the SMB3_11 variant.
+ SMB3: The same as SMB2. Used by Windows 8. SMB3 has sub protocols available.     SMB3_00: Windows 8 SMB3 version.       SMB3_02: Windows 8.1 SMB3 version.       SMB3_11: Windows 10 SMB3 version.   By default SMB3 selects the SMB3_11 variant.
 \r
 \r
  Normally this option should not be set as the automatic\r