merge fix for core dump when called with no args from 2.2

(This used to be commit 8b38cca631a7434fcce0686c8e41c986a0a36a21)

diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 7725bfe4099640f6b59e6075ce20c8ab21c664bf..0e0b531080ff0913477377f1ef751bf40b45685a 100644 (file)
--- a/source3/torture/masktest.c
+++ b/source3/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);
        }