sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-04 16:58:42 +03:00
Code

s3:torture: avoid interpret_protocol()

Browse Source 
lp_set_cmdline("client max protocol",...) and
lp_cli_maxprotocol() are the more generic solution.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
This commit is contained in:
Stefan Metzmacher 2013-08-11 13:10:13 +02:00
parent 861ee9319f
commit 2c3c8caa0c
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source3/torture/masktest.c
View File

@ -27,7 +27,7 @@
static fstring password;
static fstring username;
static int got_pass;
static int max_protocol = PROTOCOL_NT1;
static int max_protocol = -1;
static bool showall = False;
static bool old_list = False;
static const char *maskchars = "<>\"?*abc.";
@ -510,7 +510,7 @@ static void usage(void)
verbose++;
break;
case 'M':
max_protocol = interpret_protocol(optarg, max_protocol);
lp_set_cmdline("client max protocol", optarg);
break;
case 'U':
fstrcpy(username,optarg);
@ -548,6 +548,7 @@ static void usage(void)
argc -= optind;
argv += optind;
max_protocol = lp_cli_maxprotocol();
cli = connect_one(share);
if (!cli) {

3
source3/torture/torture.c
View File

@ -46,7 +46,6 @@ extern char *optarg;
extern int optind;
fstring host, workgroup, share, password, username, myname;
static int max_protocol = PROTOCOL_NT1;
static const char *sockops="TCP_NODELAY";
int torture_nprocs=1;
static int port_to_use=0;
@ -9759,7 +9758,7 @@ static void usage(void)
fstrcpy(workgroup,optarg);
break;
case 'm':
max_protocol = interpret_protocol(optarg, max_protocol);
lp_set_cmdline("client max protocol", optarg);
break;
case 'N':
torture_nprocs = atoi(optarg);