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/net.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/net.c')
| -rw-r--r-- | source3/utils/net.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/source3/utils/net.c b/source3/utils/net.c index 6993f9e52c..44119dc2c6 100644 --- a/source3/utils/net.c +++ b/source3/utils/net.c @@ -47,8 +47,6 @@ #include "lib/netapi/netapi.h" #include "../libcli/security/security.h" -extern bool AllowDebugChange; - #ifdef WITH_FAKE_KASERVER #include "utils/net_afs.h" #endif @@ -835,7 +833,7 @@ static struct functable net_func[] = { #endif /* set default debug level to 0 regardless of what smb.conf sets */ - DEBUGLEVEL_CLASS[DBGC_ALL] = 0; + lp_set_cmdline("log level", "0"); c->private_data = net_func; pc = poptGetContext(NULL, argc, (const char **) argv, long_options, @@ -874,11 +872,6 @@ static struct functable net_func[] = { } } - /* - * Don't load debug level from smb.conf. It should be - * set by cmdline arg or remain default (0) - */ - AllowDebugChange = false; lp_load(get_dyn_CONFIGFILE(), true, false, false, true); argv_new = (const char **)poptGetArgs(pc); |