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

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>

diff --git a/docs-xml/build/DTD/samba.entities b/docs-xml/build/DTD/samba.entities
index beff3cb1f6e6a05b7bb3745214e31c96cf1e3b1e..0a4a21db63e9fecf27ee753394c8a352943f6fca 100644 (file)
--- a/docs-xml/build/DTD/samba.entities
+++ b/docs-xml/build/DTD/samba.entities
@@ -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;

diff --git a/docs-xml/manpages/mdsearch.1.xml b/docs-xml/manpages/mdsearch.1.xml
index 14bc825feac46b8af4a454318358a3e3017789c0..e5b443f4a75254b1aeb02f67f949f32e34c5a208 100644 (file)
--- a/docs-xml/manpages/mdsearch.1.xml
+++ b/docs-xml/manpages/mdsearch.1.xml
@@ -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>

diff --git a/docs-xml/manpages/net.8.xml b/docs-xml/manpages/net.8.xml
index aade21a5a5a1fdc882388e50b3126e82ea55c4f6..1bd829331373dd8f405a66ff72e37878ff2aab92 100644 (file)
--- a/docs-xml/manpages/net.8.xml
+++ b/docs-xml/manpages/net.8.xml
@@ -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>

diff --git a/docs-xml/manpages/nmblookup.1.xml b/docs-xml/manpages/nmblookup.1.xml
index 9ac602cbd592058c903adb5ddb0a8648806d9ab9..08b0882504f11524c2f34fd0090b3859a3a3ed0c 100644 (file)
--- a/docs-xml/manpages/nmblookup.1.xml
+++ b/docs-xml/manpages/nmblookup.1.xml
@@ -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>

diff --git a/docs-xml/manpages/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml
index 16fbe9207e4fcae7243dd810bea97aeb49e90cdf..7c0c380cd8d88801ce9a649db9618594ef7a2883 100644 (file)
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -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>

diff --git a/docs-xml/manpages/samba-regedit.8.xml b/docs-xml/manpages/samba-regedit.8.xml
index aa2668e869e61df088fb354ca3f1a2f456b3c147..2cda0c00bdb055d58f9638a475f5799c44c74204 100644 (file)
--- a/docs-xml/manpages/samba-regedit.8.xml
+++ b/docs-xml/manpages/samba-regedit.8.xml
@@ -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>

diff --git a/docs-xml/manpages/smbcacls.1.xml b/docs-xml/manpages/smbcacls.1.xml
index 715308bf73d40e7f631a4e03d8ca41906bdfcc67..9cc2d66a8989f3dd45593651819a30a7a958d324 100644 (file)
--- a/docs-xml/manpages/smbcacls.1.xml
+++ b/docs-xml/manpages/smbcacls.1.xml
@@ -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>

diff --git a/docs-xml/manpages/smbclient.1.xml b/docs-xml/manpages/smbclient.1.xml
index 9b62f46f56359fb9c82039b8f528cf20891d40ce..40f9d896e30c71f338fa20d5b0f84319c322b45d 100644 (file)
--- a/docs-xml/manpages/smbclient.1.xml
+++ b/docs-xml/manpages/smbclient.1.xml
@@ -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>

diff --git a/docs-xml/manpages/smbcquotas.1.xml b/docs-xml/manpages/smbcquotas.1.xml
index 0d9b6d69e29911c7986b3fc45728c431750b24d6..b5ce53ce31bef986007b9b56bf9d5a4e9bd9fbe0 100644 (file)
--- a/docs-xml/manpages/smbcquotas.1.xml
+++ b/docs-xml/manpages/smbcquotas.1.xml
@@ -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>

diff --git a/docs-xml/manpages/winexe.1.xml b/docs-xml/manpages/winexe.1.xml
index a7768424dd22269235d7b87f8e04cf11ccff6372..ddce91e3fa84f66914b1b7176cc0908a7f6fba26 100644 (file)
--- a/docs-xml/manpages/winexe.1.xml
+++ b/docs-xml/manpages/winexe.1.xml
@@ -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>

diff --git a/lib/cmdline/cmdline.c b/lib/cmdline/cmdline.c
index b22306963a5b91f6a8da5adc20382f0cbb914ba6..40292a6a3327f079517b619a112a96d23b0ff135 100644 (file)
--- a/lib/cmdline/cmdline.c
+++ b/lib/cmdline/cmdline.c
@@ -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',

diff --git a/source3/utils/net_help_common.c b/source3/utils/net_help_common.c
index fc6ce913f6dad2d012d5b406f485b00b9b41afde..a861d3ffd145fdbac5bff5ddad8efe4d2f4faa68 100644 (file)
--- a/source3/utils/net_help_common.c
+++ b/source3/utils/net_help_common.c
@@ -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"));