smbcquotas: add -m option

Add the "standard" -m command line option that controls max
client protocol.

Signed-off-by: Uri Simchoni <uri@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>

diff --git a/docs-xml/manpages/smbcquotas.1.xml b/docs-xml/manpages/smbcquotas.1.xml
index bbdb9fdbb516bfe1b6ff8c4dcecfa46932b0ff66..bff24a4a2b8750664324be5817f4ee2d0b22d2f5 100644 (file)
--- a/docs-xml/manpages/smbcquotas.1.xml
+++ b/docs-xml/manpages/smbcquotas.1.xml
@@ -34,6 +34,7 @@
                <arg choice="opt">-V</arg>
 
                <arg choice="opt">-U username</arg>
+               <arg choice="opt">-m|--max-protocol LEVEL</arg>
                <arg choice="opt">-N</arg>
                <arg choice="opt">-k</arg>
                <arg choice="opt">-A</arg>
@@ -95,6 +96,17 @@
                to a readable string format.</para></listitem>
                </varlistentry>
 
+               <varlistentry>
+               <term>-m|--max-protocol PROTOCOL_NAME</term>
+               <listitem><para>This allows the user to select the
+               highest SMB protocol level that smbcquotas will use to
+               connect to the server. By default this is set to
+               NT1, which is the highest available SMB1 protocol.
+               To connect using SMB2 or SMB3 protocol, use the
+               strings SMB2 or SMB3 respectively.
+               </para></listitem>
+               </varlistentry>
+
                <varlistentry>
                <term>-t|--test-args</term>
                <listitem><para>

diff --git a/source3/utils/smbcquotas.c b/source3/utils/smbcquotas.c
index c12245735415a71adb239eae96d8b91c5f00fae5..06ecea156613c53318a06f2b84559737bba7e66b 100644 (file)
--- a/source3/utils/smbcquotas.c
+++ b/source3/utils/smbcquotas.c
@@ -598,6 +598,8 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
                { "numeric", 'n', POPT_ARG_NONE, NULL, 'n', "Don't resolve sids or limits to names" },
                { "verbose", 'v', POPT_ARG_NONE, NULL, 'v', "be verbose" },
                { "test-args", 't', POPT_ARG_NONE, NULL, 't', "Test arguments"},
+               {"max-protocol", 'm', POPT_ARG_STRING, NULL, 'm',
+                "Set the max protocol level", "LEVEL"},
                POPT_COMMON_SAMBA
                POPT_COMMON_CREDENTIALS
                { NULL }
@@ -679,6 +681,10 @@ FSQFLAGS:QUOTA_ENABLED/DENY_DISK/LOG_SOFTLIMIT/LOG_HARD_LIMIT", "SETSTRING" },
                        }
                        todo = SET_QUOTA;
                        break;
+               case 'm':
+                       lp_set_cmdline("client max protocol",
+                                      poptGetOptArg(pc));
+                       break;
                }
        }