sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-12 20:58:37 +03:00
Code

lib/cmdline: restore s3 option name --max-protocol for MAXPROTOCOL from 4.14

Browse Source 
s4 used --maxprotocol, s3 used --max-protocol. We should continue supporting
--max-protocol.

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14828

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Stefan Metzmacher <metze@samba.org>
(cherry picked from commit 29910da882d75b20d63714a1365a7b0dba6904a7)
This commit is contained in:
Ralph Boehme 2021-09-10 11:22:07 +02:00 committed by Jule Anger
parent ec937b7035
commit 619baa2390
12 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs-xml/build/DTD/samba.entities
View File

@ -556,9 +556,9 @@
</varlistentry>
'>
<!ENTITY cmdline.common.connection.maxprotocol '
<!ENTITY cmdline.common.connection.max-protocol '
<varlistentry>
<term>-m|--maxprotocol=MAXPROTOCOL</term>
<term>-m|--max-protocol=MAXPROTOCOL</term>
<listitem>
<para>
The value of the parameter (a string) is the highest
@ -577,7 +577,7 @@
<!ENTITY cmdline.common.connection '
&cmdline.common.connection.nameresolve;
&cmdline.common.connection.socketoptions;
&cmdline.common.connection.maxprotocol;
&cmdline.common.connection.max-protocol;
&cmdline.common.connection.netbiosname;
&cmdline.common.connection.netbiosscope;
&cmdline.common.connection.workgroup;

2
docs-xml/manpages/mdsearch.1.xml
View File

@ -34,7 +34,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
docs-xml/manpages/net.8.xml
View File

@ -32,7 +32,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
docs-xml/manpages/nmblookup.1.xml
View File

@ -40,7 +40,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
docs-xml/manpages/rpcclient.1.xml
View File

@ -34,7 +34,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
docs-xml/manpages/samba-regedit.8.xml
View File

@ -30,7 +30,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
docs-xml/manpages/smbcacls.1.xml
View File

@ -48,7 +48,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
docs-xml/manpages/smbclient.1.xml
View File

@ -43,7 +43,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
docs-xml/manpages/smbcquotas.1.xml
View File

@ -38,7 +38,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
docs-xml/manpages/winexe.1.xml
View File

@ -34,7 +34,7 @@
<arg choice="opt">--leak-report-full</arg>
<arg choice="opt">-R|--name-resolve=NAME-RESOLVE-ORDER</arg>
<arg choice="opt">-O|--socket-options=SOCKETOPTIONS</arg>
<arg choice="opt">-m|--maxprotocol=MAXPROTOCOL</arg>
<arg choice="opt">-m|--max-protocol=MAXPROTOCOL</arg>
<arg choice="opt">-n|--netbiosname=NETBIOSNAME</arg>
<arg choice="opt">--netbios-scope=SCOPE</arg>
<arg choice="opt">-W|--workgroup=WORKGROUP</arg>

2
lib/cmdline/cmdline.c
View File

@ -690,7 +690,7 @@ static struct poptOption popt_common_connection[] = {
.argDescrip = "SOCKETOPTIONS",
},
{
.longName = "maxprotocol",
.longName = "max-protocol",
.shortName = 'm',
.argInfo = POPT_ARG_STRING,
.val = 'm',

2
source3/utils/net_help_common.c
View File

@ -64,7 +64,7 @@ int net_common_flags_usage(struct net_context *c, int argc, const char **argv)
d_printf(_("\t-R|--name-resolve=NAME-RESOLVE-ORDER\tUse these name "
"resolution services only\n"));
d_printf(_("\t-O|--socket-options=SOCKETOPTIONS\tsocket options to use\n"));
d_printf(_("\t-m|--maxprotocol=MAXPROTOCOL\t\tSet max protocol level\n"));
d_printf(_("\t-m|--max-protocol=MAXPROTOCOL\t\tSet max protocol level\n"));
d_printf(_("\t-n|--netbiosname=NETBIOSNAME\t\tPrimary netbios name\n"));
d_printf(_("\t--netbios-scope=SCOPE\t\t\tUse this Netbios scope\n"));
d_printf(_("\t-W|--workgroup=WORKGROUP\t\tSet the workgroup name\n"));