testparm: rename -g|--skip-global-ckecks to -l|--skip-logic-checks

as suggested by Karolin.

That is what it really means. And per-share logic tests will be
disabled by the same switch, too...

Michael
(cherry picked from commit 5b8a4c33482917a1ef7071df224957ba831d853a)
(cherry picked from commit 04cdfbba747b928c3133e29446c0fe91c39a41f2)

2 files changed, 4 insertions, 4 deletions

diff --git a/source/script/tests/test_testparm_s3.sh b/source/script/tests/test_testparm_s3.sh
index 875f138f87c..0962ca07642 100755
--- a/source/script/tests/test_testparm_s3.sh
+++ b/source/script/tests/test_testparm_s3.sh
@@ -6,7 +6,7 @@
 # and the macro expansions.
 
 TEMP_CONFFILE=${LIBDIR}/smb.conf.tmp
-TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-global-checks"
+TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-logic-checks"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
diff --git a/source/utils/testparm.c b/source/utils/testparm.c
index 018993ccf3b..af20d046068 100644
--- a/source/utils/testparm.c
+++ b/source/utils/testparm.c
@@ -217,7 +217,7 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 	const char *cname;
 	const char *caddr;
 	static int show_defaults;
-	static int skip_global_checks = 0;
+	static int skip_logic_checks = 0;
 
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
@@ -225,7 +225,7 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 		{"verbose", 'v', POPT_ARG_NONE, &show_defaults, 1, "Show default options too"},
 		{"server", 'L',POPT_ARG_STRING, &new_local_machine, 0, "Set %%L macro to servername\n"},
 		{"encoding", 't', POPT_ARG_STRING, &term_code, 0, "Print parameters with encoding"},
-		{"skip-global-checks", 'g', POPT_ARG_NONE, &skip_global_checks, 1, "Skip the global checks"},
+		{"skip-logic-checks", 'l', POPT_ARG_NONE, &skip_logic_checks, 1, "Skip the global checks"},
 		{"show-all-parameters", '\0', POPT_ARG_VAL, &show_all_parameters, True, "Show the parameters, type, possible values" },
 		{"parameter-name", '\0', POPT_ARG_STRING, &parameter_name, 0, "Limit testparm to a named parameter" },
 		{"section-name", '\0', POPT_ARG_STRING, &section_name, 0, "Limit testparm to a named section" },
@@ -278,7 +278,7 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 
 	fprintf(stderr,"Loaded services file OK.\n");
 
-	if (skip_global_checks == 0) {
+	if (skip_logic_checks == 0) {
 		ret = do_global_checks();
 	}