From cf4de8ec2c8df2ceabbe3d836d296b058e7b19fb Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 29 Oct 2010 15:06:36 +1100 Subject: s3-debug Remove 'AllowDebugChange' and use lp_set_cmdline() instead By removing this global variable, the API between the two different debug systems is made more similar. Both s3 and s4 now have lp_set_cmdline() which ensures that the smb.conf cannot overwrite these the user-specified log level. Andrew Bartlett --- source3/param/test_lp_load.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source3/param/test_lp_load.c') diff --git a/source3/param/test_lp_load.c b/source3/param/test_lp_load.c index 94715b5a59..d5673587a0 100644 --- a/source3/param/test_lp_load.c +++ b/source3/param/test_lp_load.c @@ -20,8 +20,6 @@ #include "includes.h" #include "popt_common.h" -extern bool AllowDebugChange; - int main(int argc, const char **argv) { const char *config_file = get_dyn_CONFIGFILE(); @@ -41,7 +39,7 @@ int main(int argc, const char **argv) TALLOC_CTX *frame = talloc_stackframe(); load_case_tables(); - DEBUGLEVEL_CLASS[DBGC_ALL] = 0; + lp_set_cmdline("log level", "0"); pc = poptGetContext(NULL, argc, argv, long_options, POPT_CONTEXT_KEEP_FIRST); @@ -61,9 +59,6 @@ int main(int argc, const char **argv) count = atoi(count_str); } - /* Don't let the debuglevel be changed by smb.conf. */ - AllowDebugChange = False; - for (i=0; i < count; i++) { printf("call lp_load() #%d: ", i+1); if (!lp_load_with_registry_shares(config_file, -- cgit