From f1256e847e6820c29f8bc74db4609d8aa282a1a1 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Mon, 7 Jan 2002 21:32:22 +0000 Subject: 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) --- source3/lib/debug.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'source3/lib/debug.c') 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); -- cgit