s3:rpcclient add -m option

Signed-off-by: Christian Ambach <ambi@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
Autobuild-User(master): Jeremy Allison <jra@samba.org>
Autobuild-Date(master): Thu May 12 17:36:09 CEST 2016 on sn-devel-144

diff --git a/docs-xml/manpages/rpcclient.1.xml b/docs-xml/manpages/rpcclient.1.xml
index fcdd0c668d5a4979e3836af2fd29939a5cec5d91..2ce1443c7bf667be523b929f30a94dd9112ff220 100644 (file)
--- a/docs-xml/manpages/rpcclient.1.xml
+++ b/docs-xml/manpages/rpcclient.1.xml
@@ -24,6 +24,7 @@
                <arg choice="opt">-c &lt;command string&gt;</arg>
                <arg choice="opt">-d debuglevel</arg>
                <arg choice="opt">-l logdir</arg>
+               <arg choice="opt">-m maxprotocol</arg>
                <arg choice="opt">-N</arg>
                <arg choice="opt">-s &lt;smb config file&gt;</arg>
                <arg choice="opt">-U username[%password]</arg>
@@ -85,6 +86,19 @@
                above. </para></listitem>
                </varlistentry>
 
+               <varlistentry>
+               <term>-m|--max-protocol protocol</term>
+               <listitem><para>This allows the user to select the
+               highest SMB protocol level that rpcclient 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. Note that to connect
+               to a Windows 2012 server with encrypted transport selecting
+               a max-protocol of SMB3 is required.
+               </para></listitem>
+               </varlistentry>
+
                <varlistentry>
                <term>-p|--port port</term>
                <listitem><para>This number is the TCP port number that will be used

diff --git a/source3/rpcclient/rpcclient.c b/source3/rpcclient/rpcclient.c
index efca9530cf249fc8be0eeef1e700294916893255..44d691bd61433d61ae92167b7313e497030f94fb 100644 (file)
--- a/source3/rpcclient/rpcclient.c
+++ b/source3/rpcclient/rpcclient.c
@@ -913,6 +913,7 @@ out_free:
                {"command",     'c', POPT_ARG_STRING,   &cmdstr, 'c', "Execute semicolon separated cmds", "COMMANDS"},
                {"dest-ip", 'I', POPT_ARG_STRING,   &opt_ipaddr, 'I', "Specify destination IP address", "IP"},
                {"port", 'p', POPT_ARG_INT,   &opt_port, 'p', "Specify port number", "PORT"},
+               {"max-protocol", 'm', POPT_ARG_STRING, NULL, 'm', "Set the max protocol level", "LEVEL" },
                POPT_COMMON_SAMBA
                POPT_COMMON_CONNECTION
                POPT_COMMON_CREDENTIALS
@@ -949,6 +950,10 @@ out_free:
        while((opt = poptGetNextOpt(pc)) != -1) {
                switch (opt) {
 
+               case 'm':
+                       lp_set_cmdline("client max protocol", poptGetOptArg(pc));
+                       break;
+
                case 'I':
                        if (!interpret_string_addr(&server_ss,
                                                opt_ipaddr,