summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2004-09-10 03:39:11 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:58:37 -0500
commit68fbed64d500d8eb2464497893145a58b1177b97 (patch)
tree5f8ff4f9be378aef9f824f22a1c01b33bae60bfd /source4
parent2340725753b4ecb5f0681a25fd4921b177616cfb (diff)
downloadsamba-68fbed64d500d8eb2464497893145a58b1177b97.tar.gz
samba-68fbed64d500d8eb2464497893145a58b1177b97.tar.bz2
samba-68fbed64d500d8eb2464497893145a58b1177b97.zip
r2274: fixed some popt option clashes between smbtorture and the standard options
(This used to be commit b7db909e8e8194366ff93f68adbd68a8f1dcbe9a)
Diffstat (limited to 'source4')
-rw-r--r--source4/torture/torture.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/source4/torture/torture.c b/source4/torture/torture.c
index efcd4f2e2e..e4729470dd 100644
--- a/source4/torture/torture.c
+++ b/source4/torture/torture.c
@@ -4385,16 +4385,16 @@ static void usage(poptContext pc)
struct poptOption long_options[] = {
POPT_AUTOHELP
{"smb-ports", 'p', POPT_ARG_STRING, NULL, 0, "SMB ports", NULL},
- {"seed", 0, POPT_ARG_STRING, NULL, 0, "seed", NULL},
- {"num-progs", 0, POPT_ARG_INT, &torture_nprocs, 0, "num progs", NULL},
- {"num-ops", 0, POPT_ARG_INT, &torture_numops, 0, "num ops", NULL},
- {"entries", 0, POPT_ARG_INT, &torture_entries, 0, "entries", NULL},
+ {"seed", 0, POPT_ARG_STRING, NULL, 0, "seed", NULL},
+ {"num-progs", 0, POPT_ARG_INT, &torture_nprocs, 0, "num progs", NULL},
+ {"num-ops", 0, POPT_ARG_INT, &torture_numops, 0, "num ops", NULL},
+ {"entries", 0, POPT_ARG_INT, &torture_entries, 0, "entries", NULL},
{"use-oplocks", 'L', POPT_ARG_NONE, &use_oplocks, 0, "use oplocks", NULL},
- {"show-all", 'A', POPT_ARG_NONE, &torture_showall, 0, "show all", NULL},
+ {"show-all", 0, POPT_ARG_NONE, &torture_showall, 0, "show all", NULL},
{"loadfile", 0, POPT_ARG_STRING, NULL, OPT_LOADFILE, "loadfile", NULL},
{"unclist", 0, POPT_ARG_STRING, NULL, OPT_UNCLIST, "unclist", NULL},
{"timelimit", 't', POPT_ARG_STRING, NULL, OPT_TIMELIMIT, "timelimit", NULL},
- {"failures", 'f', POPT_ARG_INT, &torture_failures, 0, "failures", NULL},
+ {"failures", 'f', POPT_ARG_INT, &torture_failures, 0, "failures", NULL},
{"parse-dns", 'D', POPT_ARG_STRING, NULL, OPT_DNS, "parse-dns", NULL},
{"dangerous", 'X', POPT_ARG_NONE, NULL, OPT_DANGEROUS, "dangerous", NULL},
POPT_COMMON_SAMBA