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

[jelmer at samba.org]

Author: jelmer
Date: 2006-11-04 17:06:38 +0000 (Sat, 04 Nov 2006)
New Revision: 19554

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19554

Log:
Remove short option for --shell, as it overlaps with the option used for 
configuration files.

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


Changeset:
Modified: branches/SAMBA_4_0/source/torture/smbtorture.c
===================================================================
--- branches/SAMBA_4_0/source/torture/smbtorture.c	2006-11-04 15:40:05 UTC (rev 19553)
+++ branches/SAMBA_4_0/source/torture/smbtorture.c	2006-11-04 17:06:38 UTC (rev 19554)
@@ -536,7 +536,7 @@
 		{"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},