--- samba.org/source/torture/torture.c	Tue Dec 16 10:11:39 2003
+++ samba/source/torture/torture.c	Fri Dec 26 18:29:24 2003
@@ -4581,6 +4599,7 @@
 {
 	BOOL ret = True;
 	BOOL result = True;
+	BOOL notfound = True;
 	int i;
 	double t;
 	if (strequal(name,"ALL")) {
@@ -4595,6 +4614,7 @@
 
 		if (strequal(name, torture_ops[i].name)) {
 			printf("Running %s\n", name);
+			notfound = False;
 			if (torture_ops[i].flags & FLAG_MULTIPROC) {
 				t = create_procs(torture_ops[i].fn, &result);
 				if (!result) { 
@@ -4613,6 +4633,12 @@
 			printf("%s took %g secs\n\n", name, t);
 		}
 	}
+
+	if (notfound) {
+		printf("Unknow test %s is specified\n", name);
+		return False;
+	}
+
 	return ret;
 }
 
@@ -4780,10 +4823,10 @@
 	printf("host=%s share=%s user=%s myname=%s\n", 
 	       host, share, username, myname);
 
-	if (argc == 1) {
+	if (argc == optind) {
 		correct = run_test("ALL");
 	} else {
-		for (i=1;i<argc;i++) {
+		for (i=optind;i<argc;i++) {
 			if (!run_test(argv[i])) {
 				correct = False;
 			}