From: Michael Adam <obnox@samba.org>
Date: Tue, 15 Jul 2008 09:26:43 +0000 (+0200)
Subject: testparm: allow the default debug level of 2 to be changed from the command line.
X-Git-Tag: samba-3.3.0pre1~550^2~21
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a0883a7f28538fad542293e1d9361e8c4bed1fd;p=thirdparty%2Fsamba.git

testparm: allow the default debug level of 2 to be changed from the command line.

Michael
---

diff --git a/source/utils/testparm.c b/source/utils/testparm.c
index 212dcf0676b..527db2d8053 100644
--- a/source/utils/testparm.c
+++ b/source/utils/testparm.c
@@ -296,12 +296,19 @@ rameter is ignored when using CUPS libraries.\n",
 		{"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" },
 		POPT_COMMON_VERSION
+		POPT_COMMON_DEBUGLEVEL
 		POPT_TABLEEND
 	};
 
 	TALLOC_CTX *frame = talloc_stackframe();
 
 	load_case_tables();
+	/*
+	 * Set the default debug level to 2.
+	 * Allow it to be overridden by the command line,
+	 * not by smb.conf.
+	 */
+	DEBUGLEVEL_CLASS[DBGC_ALL] = 2;
 
 	pc = poptGetContext(NULL, argc, argv, long_options, 
 			    POPT_CONTEXT_KEEP_FIRST);
@@ -332,7 +339,7 @@ rameter is ignored when using CUPS libraries.\n",
 	}
 
 	dbf = x_stderr;
-	DEBUGLEVEL = 2;
+	/* Don't let the debuglevel be changed by smb.conf. */
 	AllowDebugChange = False;
 
 	fprintf(stderr,"Load smb config files from %s\n",config_file);