summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-11-04 17:06:38 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:24:49 -0500
commit8d90810433453455aa833e60354c5a2cc2f59f05 (patch)
tree26ec3a09870d61db3ec8e6e20e2a8671cbf7216f /source4
parent0f738f13f9a0105a0eb6506537f538a093446904 (diff)
downloadsamba-8d90810433453455aa833e60354c5a2cc2f59f05.tar.gz
samba-8d90810433453455aa833e60354c5a2cc2f59f05.tar.bz2
samba-8d90810433453455aa833e60354c5a2cc2f59f05.zip
r19554: Remove short option for --shell, as it overlaps with the option used for
configuration files. (This used to be commit c2e58aa3e67ad6a03464ada5ae0e1437f3863b64)
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/smbtorture.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/torture/smbtorture.c b/source4/torture/smbtorture.c
index ecb5d072d9..5b79874986 100644
--- 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},