sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

Revert "s3:rpcclient add -m option"

Browse Source 
This reverts commit a55ac51f5f.

This will be implemented in a more common way using the
"client ipc max protocol" option.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2016-05-19 11:47:29 +02:00 committed by Jeremy Allison
parent 7d0def3056
commit f4b5e9d44d
2 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,7 +24,6 @@
<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>
@ -86,19 +85,6 @@
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

5
source3/rpcclient/rpcclient.c
View File

@ -913,7 +913,6 @@ 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
@ -950,10 +949,6 @@ 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,