From: Stefan Metzmacher Date: Fri, 9 Jul 2021 10:03:06 +0000 (+0200) Subject: docs-xml: remove support for "SMB3_10" X-Git-Tag: samba-4.15.0rc1~54 X-Git-Url: http://git.samba.org/?p=samba.git;a=commitdiff_plain;h=41cf9f8966e22a391fa484872a48d9c89abc5db0 docs-xml: remove support for "SMB3_10" Signed-off-by: Stefan Metzmacher Reviewed-by: Jeremy Allison --- diff --git a/docs-xml/manpages/smb.conf.5.xml b/docs-xml/manpages/smb.conf.5.xml index 888771cdc9c..72664a2e457 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 %R 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. diff --git a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml index 16b40615792..784123ecadf 100644 --- a/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml +++ b/docs-xml/smbdotconf/protocol/clientmaxprotocol.xml @@ -59,10 +59,7 @@ 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). + SMB3_11: Windows 10 SMB3 version. By default SMB3 selects the SMB3_11 variant. diff --git a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml index c573c73966a..815841d6001 100644 --- a/docs-xml/smbdotconf/protocol/servermaxprotocol.xml +++ b/docs-xml/smbdotconf/protocol/servermaxprotocol.xml @@ -48,10 +48,7 @@ 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). + SMB3_11: Windows 10 SMB3 version. By default SMB3 selects the SMB3_11 variant. diff --git a/lib/param/param_table.c b/lib/param/param_table.c index d4d372240bc..d9301152d94 100644 --- 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 df07c805c9d..a954c41a7d0 100755 --- a/libgpo/admx/en-US/samba.adml +++ b/libgpo/admx/en-US/samba.adml @@ -1200,7 +1200,7 @@ Example: SMB3_11 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. 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. Normally this option should not be set as the automatic @@ -1388,7 +1388,7 @@ In general this parameter should be viewed as a system tuning tool and left seve 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. 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. Normally this option should not be set as the automatic