diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2010-10-29 15:06:36 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2010-11-02 04:36:04 +0000 |
| commit | cf4de8ec2c8df2ceabbe3d836d296b058e7b19fb (patch) | |
| tree | 9afa59acaf2a8665e9bc9dfc8bdc177db4a7ca36 /source3/utils/testparm.c | |
| parent | 9da4ace1d9789d300ab298bc34694c44b2062f30 (diff) | |
| download | samba-cf4de8ec2c8df2ceabbe3d836d296b058e7b19fb.tar.gz samba-cf4de8ec2c8df2ceabbe3d836d296b058e7b19fb.tar.bz2 samba-cf4de8ec2c8df2ceabbe3d836d296b058e7b19fb.zip | |
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
Diffstat (limited to 'source3/utils/testparm.c')
| -rw-r--r-- | source3/utils/testparm.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/source3/utils/testparm.c b/source3/utils/testparm.c index 8b8a31ea40..b17d61b914 100644 --- a/source3/utils/testparm.c +++ b/source3/utils/testparm.c @@ -34,8 +34,6 @@ #include "includes.h" #include "popt_common.h" -extern bool AllowDebugChange; - /******************************************************************* Check if a directory exists. ********************************************************************/ @@ -352,7 +350,7 @@ rameter is ignored when using CUPS libraries.\n", * Allow it to be overridden by the command line, * not by smb.conf. */ - DEBUGLEVEL_CLASS[DBGC_ALL] = 2; + lp_set_cmdline("log level", "2"); pc = poptGetContext(NULL, argc, argv, long_options, POPT_CONTEXT_KEEP_FIRST); @@ -381,9 +379,6 @@ rameter is ignored when using CUPS libraries.\n", goto done; } - /* Don't let the debuglevel be changed by smb.conf. */ - AllowDebugChange = False; - fprintf(stderr,"Load smb config files from %s\n",config_file); if (!lp_load_with_registry_shares(config_file,False,True,False,True)) { |