diff options
Diffstat (limited to 'source/lib/debug.c')
| -rw-r--r-- | source/lib/debug.c | 21 |
1 files changed, 6 insertions, 15 deletions
diff --git a/source/lib/debug.c b/source/lib/debug.c index 3731b3656fa..d3ba8f9c370 100644 --- a/source/lib/debug.c +++ b/source/lib/debug.c @@ -86,7 +86,7 @@ BOOL append_log = False; int DEBUGLEVEL_CLASS[DBGC_LAST]; int DEBUGLEVEL = DEBUGLEVEL_CLASS; BOOL AllowDebugChange = True; -int parsed_debuglevel_class[DBGC_LAST]; + /* -------------------------------------------------------------------------- ** * Internal variables. @@ -214,6 +214,8 @@ BOOL debug_parse_levels(char *params_str) char *params[DBGC_LAST]; int debuglevel_class[DBGC_LAST]; + if (AllowDebugChange == False) + return True; ZERO_ARRAY(params); ZERO_ARRAY(debuglevel_class); @@ -226,19 +228,8 @@ BOOL debug_parse_levels(char *params_str) else return False; - if (AllowDebugChange == False) { - int old_debuglevel_class[DBGC_LAST]; - - /* save current debug level */ - memcpy(old_debuglevel_class, DEBUGLEVEL_CLASS, sizeof(DEBUGLEVEL_CLASS)); - if (debug_parse_params(params, debuglevel_class)) - debug_message(0, getpid(), (void*)debuglevel_class, sizeof(debuglevel_class)); - memcpy(parsed_debuglevel_class, DEBUGLEVEL_CLASS, sizeof(DEBUGLEVEL_CLASS)); - memcpy(DEBUGLEVEL_CLASS, old_debuglevel_class, sizeof(old_debuglevel_class)); - return True; - } if (debug_parse_params(params, debuglevel_class)) { - debug_message(DEBUGLEVEL, getpid(), (void*)debuglevel_class, sizeof(debuglevel_class)); + debug_message(0, getpid(), (void*)debuglevel_class, sizeof(debuglevel_class)); return True; } else return False; @@ -247,14 +238,14 @@ BOOL debug_parse_levels(char *params_str) /**************************************************************************** receive a "set debug level" message ****************************************************************************/ -void debug_message(int msg_level, pid_t src, void *buf, size_t len) +void debug_message(int msg_type, pid_t src, void *buf, size_t len) { int i; /* Set the new DEBUGLEVEL_CLASS array from the pased array */ memcpy(DEBUGLEVEL_CLASS, buf, sizeof(DEBUGLEVEL_CLASS)); - DEBUG(msg_level,("INFO: Debug class %s level = %d (pid %u from pid %u)\n", + DEBUG(1,("INFO: Debug class %s level = %d (pid %u from pid %u)\n", classname_table[DBGC_ALL], DEBUGLEVEL_CLASS[DBGC_ALL], (unsigned int)getpid(), (unsigned int)src)); |