diff options
| -rw-r--r-- | docs-xml/manpages/smb.conf.5.xml | 2 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/protocol/clientmaxprotocol.xml | 3 | ||||
| -rw-r--r-- | docs-xml/smbdotconf/protocol/servermaxprotocol.xml | 3 | ||||
| -rw-r--r-- | lib/param/param_table.c | 1 | ||||
| -rwxr-xr-x | libgpo/admx/en-US/samba.adml | 4 |
5 files changed, 3 insertions, 10 deletions
diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml index eb4bcba3ee5..55cb9efa123 100644 --- 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 eba18bfb80a..660e603936c 100644 --- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml +++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml @@ -45,9 +45,6 @@ <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> </itemizedlist> diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml index 1dbe602d278..7acb8cddf95 100644 --- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml +++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml @@ -34,9 +34,6 @@ <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> </itemizedlist> diff --git a/lib/param/param_table.c b/lib/param/param_table.c index a67e8549294..1f5e136b1c6 100644 --- 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 965af175e24..a24deabc942 100755 --- 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.
LANMAN2: Updates to Lanman1 protocol.
NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS.
- 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.
+ 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.
@@ -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.
LANMAN2: Updates to Lanman1 protocol.
NT1: Current up to date version of the protocol. Used by Windows NT. Known as CIFS.
- 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.
+ 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.
|