sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-24 21:34:56 +03:00
Code

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

Browse Source 
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 5b8a4c3348)
This commit is contained in:
Michael Adam 2008-07-15 12:52:25 +02:00
parent 9978cc6c23
commit 7cc155bdc1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source3/script/tests/test_testparm_s3.sh
View File

@ -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

6
source3/utils/testparm.c
View File

@ -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();
}