From 8b38cca631a7434fcce0686c8e41c986a0a36a21 Mon Sep 17 00:00:00 2001
From: Herb Lewis <herb@samba.org>
Date: Thu, 21 Mar 2002 22:36:04 +0000
Subject: [PATCH] merge fix for core dump when called with no args from 2.2

---
 source/torture/masktest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source/torture/masktest.c b/source/torture/masktest.c
index 7725bfe4099..0e0b531080f 100644
--- a/source/torture/masktest.c
+++ b/source/torture/masktest.c
@@ -432,7 +432,7 @@ static void usage(void)
 	DEBUGLEVEL = 0;
 	AllowDebugChange = False;
 
-	if (argv[1][0] == '-' || argc < 2) {
+	if (argc < 2 || argv[1][0] == '-') {
 		usage();
 		exit(1);
 	}