summaryrefslogtreecommitdiff
path: root/source3/utils
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2008-07-15 12:52:25 +0200
committerMichael Adam <obnox@samba.org>2008-07-15 12:54:04 +0200
commit7cc155bdc11bed7564b1ee5564b358ff6a337459 (patch)
tree72da7d711ffdd3e237983dfb9f18ddcd0de5eb33 /source3/utils
parent9978cc6c23ef6591f0be93b244f89ad6a8454346 (diff)
downloadsamba-7cc155bdc11bed7564b1ee5564b358ff6a337459.tar.gz
samba-7cc155bdc11bed7564b1ee5564b358ff6a337459.tar.bz2
samba-7cc155bdc11bed7564b1ee5564b358ff6a337459.zip
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 (This used to be commit 5b8a4c33482917a1ef7071df224957ba831d853a)
Diffstat (limited to 'source3/utils')
-rw-r--r--source3/utils/testparm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c
index 018993ccf3..af20d04606 100644
--- a/source3/utils/testparm.c
+++ b/source3/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();
}