docs-xml: remove support for "SMB2_22"

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 eb4bcba3ee51339eec668235054d0c48d0ed633a..55cb9efa123eaee864efc93ad951bab86229b533 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, SMB2_22, SMB2_24,
+                       SMB2_02, SMB2_10, SMB2_24,
                        SMB3_00, SMB3_02, SMB3_10, 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 eba18bfb80a8a1f01dc70535b19d08471ca706cb..660e603936ce127a13d8aa16133fb100980a8514 100644 (file)
--- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml
@@ -44,9 +44,6 @@
                <listitem>
                    <para><constant>SMB2_10</constant>: Windows 7 SMB2 version.</para>
                </listitem>
-               <listitem>
-                   <para><constant>SMB2_22</constant>: Early Windows 8 SMB2 version.</para>
-               </listitem>
                <listitem>
                    <para><constant>SMB2_24</constant>: Windows 8 beta SMB2 version.</para>
                </listitem>

diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
index 1dbe602d27869f35f52bda547062acc6d55ccecb..7acb8cddf959689586a0c1876bc719e521c5ffca 100644 (file)
--- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
+++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml
@@ -33,9 +33,6 @@
                <listitem>
                    <para><constant>SMB2_10</constant>: Windows 7 SMB2 version.</para>
                </listitem>
-               <listitem>
-                   <para><constant>SMB2_22</constant>: Early Windows 8 SMB2 version.</para>
-               </listitem>
                <listitem>
                    <para><constant>SMB2_24</constant>: Windows 8 beta SMB2 version.</para>
                </listitem>

diff --git a/lib/param/param_table.c b/lib/param/param_table.c
index a67e8549294ce9ea903b8c54918eda95a559afe2..1f5e136b1c614738575593affd101d81b0a318ab 100644 (file)
--- a/lib/param/param_table.c
+++ b/lib/param/param_table.c
@@ -50,7 +50,6 @@ static const struct enum_list enum_protocol[] = {
        {PROTOCOL_SMB3_02, "SMB3_02"},
        {PROTOCOL_SMB3_00, "SMB3_00"},
        {PROTOCOL_SMB2_24, "SMB2_24"},
-       {PROTOCOL_SMB2_22, "SMB2_22"},
        {PROTOCOL_SMB2_10, "SMB2_10"},
        {PROTOCOL_SMB2_02, "SMB2_02"},
        {PROTOCOL_NT1, "NT1"},

diff --git a/libgpo/admx/en-US/samba.adml b/libgpo/admx/en-US/samba.adml
index 965af175e24b8f76effaa969918a80f9b4fae3db..a24deabc94287fbb0c9f2a86f499bd9d5d8b875b 100755 (executable)
--- a/libgpo/admx/en-US/samba.adml
+++ b/libgpo/admx/en-US/samba.adml
@@ -1199,7 +1199,7 @@ Example: SMB3_11</string>
  LANMAN1: First modern version of the protocol. Long filename support.\r
  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.       SMB2_22: Early Windows 8 SMB2 version.       SMB2_24: Windows 8 beta SMB2 version.   By default SMB2 selects the SMB2_10 variant.\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.       SMB2_24: Windows 8 beta 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. (mostly the same as SMB2_24)       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.\r
 \r
 \r
@@ -1387,7 +1387,7 @@ In general this parameter should be viewed as a system tuning tool and left seve
  LANMAN1: First modern version of the protocol. Long filename support.\r
  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.       SMB2_22: Early Windows 8 SMB2 version.       SMB2_24: Windows 8 beta SMB2 version.   By default SMB2 selects the SMB2_10 variant.\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.       SMB2_24: Windows 8 beta 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. (mostly the same as SMB2_24)       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.\r
 \r
 \r