[SCM] Samba Shared Repository - branch v3-2-test updated - release-3-2-0pre2-2736-g87c4f1f

[Michael Adam]

The branch, v3-2-test has been updated
       via  87c4f1fc67df146585a6e0862b701b6e6193f0f0 (commit)
       via  1f245e41fa41d2b67eaa7cc85c29da3384697275 (commit)
      from  56d8ed48a94b558ad442e38c3d1925c4810dc508 (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-2-test


- Log -----------------------------------------------------------------
commit 87c4f1fc67df146585a6e0862b701b6e6193f0f0
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 15 00:27:01 2008 +0200

    testsuite: fix bug #5594 by using the new --skip-global-ckecks switch
    
    Michael
    (cherry picked from commit 32f4b1443af12026c419684be45a7d8b96ccfaac)

commit 1f245e41fa41d2b67eaa7cc85c29da3384697275
Author: Michael Adam <obnox at samba.org>
Date:   Tue Jul 15 00:17:58 2008 +0200

    testparm: add a switch --skip-global-checks.
    
    This allows for successfully calling testparm without the need
    to "make install" before. Without this, testparm fails with
    the message that the lock directory does not exist...
    
    Michael
    (cherry picked from commit eeb018fad65c19804a4e96ea949fc2c64883439e)

-----------------------------------------------------------------------

Summary of changes:
 source/script/tests/test_testparm_s3.sh |    2 +-
 source/utils/testparm.c                 |    6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source/script/tests/test_testparm_s3.sh b/source/script/tests/test_testparm_s3.sh
index f1316e9..875f138 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"
+TESTPARM="$VALGRIND ${TESTPARM:-$BINDIR/testparm} --suppress-prompt --skip-global-checks"
 
 incdir=`dirname $0`
 . $incdir/test_functions.sh
diff --git a/source/utils/testparm.c b/source/utils/testparm.c
index 03291fe..018993c 100644
--- a/source/utils/testparm.c
+++ b/source/utils/testparm.c
@@ -217,6 +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;
 
 	struct poptOption long_options[] = {
 		POPT_AUTOHELP
@@ -224,6 +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"},
 		{"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" },
@@ -276,7 +278,9 @@ via the %%o substitution. With encrypted passwords this is not possible.\n", lp_
 
 	fprintf(stderr,"Loaded services file OK.\n");
 
-	ret = do_global_checks();
+	if (skip_global_checks == 0) {
+		ret = do_global_checks();
+	}
 
 	for (s=0;s<1000;s++) {
 		if (VALID_SNUM(s))


-- 
Samba Shared Repository