r19554: Remove short option for --shell, as it overlaps with the option used for

configuration files.
(This used to be commit c2e58aa3e67ad6a03464ada5ae0e1437f3863b64)

diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index ecb5d072d9bf68f382acc2c477a9d801ccf4911f..5b79874986de3904d1485719807fe94ec2025c63 100644 (file)
--- a/source4/torture/smbtorture.c
+++ b/source4/torture/smbtorture.c
@@ -536,7 +536,7 @@ int main(int argc,char *argv[])
                {"parse-dns",   'D', POPT_ARG_STRING,   NULL,   OPT_DNS,        "parse-dns",    NULL},
                {"dangerous",   'X', POPT_ARG_NONE,     NULL,   OPT_DANGEROUS,
                 "run dangerous tests (eg. wiping out password database)", NULL},
-               {"shell",               's', POPT_ARG_NONE, &shell, True, "Run shell", NULL},
+               {"shell",               0, POPT_ARG_NONE, &shell, True, "Run shell", NULL},
                {"target",              'T', POPT_ARG_STRING, &target, 0, "samba3|samba4|other", NULL},
                {"async",       'a', POPT_ARG_NONE,     NULL,   OPT_ASYNC,
                 "run async tests", NULL},