s3:torture: avoid interpret_protocol()

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>

diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 8332e806db4afe5a45fecc24ff8b2b2a5c9ad9f9..bca35aa4bf2bf962b81bee9dc445dca66bfaac5d 100644 (file)
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -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) {

diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index b0b498f1fe844fdbe5e28240315f55d1ee5c9bd8..4a8e3ed4512f89aafa65ff4bb2dac3df6a240dbf 100644 (file)
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -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);