diff options
| author | Herb Lewis <herb@samba.org> | 2002-01-07 21:32:22 +0000 |
|---|---|---|
| committer | Herb Lewis <herb@samba.org> | 2002-01-07 21:32:22 +0000 |
| commit | f1256e847e6820c29f8bc74db4609d8aa282a1a1 (patch) | |
| tree | ef8ffff0a67d9d129e950259df11f803c8a05d48 /source3/lib | |
| parent | bff833e76af390557428ba6aabdbc635b2c120e9 (diff) | |
| download | samba-f1256e847e6820c29f8bc74db4609d8aa282a1a1.tar.gz samba-f1256e847e6820c29f8bc74db4609d8aa282a1a1.tar.bz2 samba-f1256e847e6820c29f8bc74db4609d8aa282a1a1.zip | |
merge changes from 2.2 branch to prevent smb.conf from changing debug level
of commands when specified on command line.
(This used to be commit 39d6b31e14144a3ff4b992d4286b706147e58566)
Diffstat (limited to 'source3/lib')
| -rw-r--r-- | source3/lib/debug.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source3/lib/debug.c b/source3/lib/debug.c index a77328e343..f3b0f2be12 100644 --- a/source3/lib/debug.c +++ b/source3/lib/debug.c @@ -86,6 +86,7 @@ BOOL append_log = False; int DEBUGLEVEL_CLASS[DBGC_LAST]; BOOL DEBUGLEVEL_CLASS_ISSET[DBGC_LAST]; int DEBUGLEVEL = DEBUGLEVEL_CLASS; +BOOL AllowDebugChange = True; /* -------------------------------------------------------------------------- ** @@ -222,6 +223,8 @@ BOOL debug_parse_levels(char *params_str) int debuglevel_class[DBGC_LAST]; BOOL debuglevel_class_isset[DBGC_LAST]; + if (AllowDebugChange == False) + return True; ZERO_ARRAY(params); ZERO_ARRAY(debuglevel_class); ZERO_ARRAY(debuglevel_class_isset); |