svn commit: samba r2274 - in branches/SAMBA_4_0/source/torture: .

[tridge at samba.org]

Author: tridge
Date: 2004-09-10 03:39:11 +0000 (Fri, 10 Sep 2004)
New Revision: 2274

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/SAMBA_4_0/source/torture&rev=2274&nolog=1

Log:
fixed some popt option clashes between smbtorture and the standard options

Modified:
   branches/SAMBA_4_0/source/torture/torture.c


Changeset:
Modified: branches/SAMBA_4_0/source/torture/torture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/torture.c	2004-09-10 03:38:16 UTC (rev 2273)
+++ branches/SAMBA_4_0/source/torture/torture.c	2004-09-10 03:39:11 UTC (rev 2274)
@@ -4385,16 +4385,16 @@
 	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