updated the 3.0 branch from the head branch - ready for alpha18

[samba.git] / source3 / lib / debug.c

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 834c1b38f7c6c67d84cefdd0e5ed83e4ba5e93f5..f41c3b649760961fa8a4514036a3f731b4c9b1f8 100644 (file)
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -149,7 +149,7 @@ static const char *default_classname_table[] = {
        "printdrivers",      /* DBGC_PRINTDRIVERS */
        "lanman",            /* DBGC_LANMAN       */
        "smb",               /* DBGC_SMB          */
-       "rpc",               /* DBGC_RPC          */
+       "rpc_parse",         /* DBGC_RPC_PARSE    */
        "rpc_srv",           /* DBGC_RPC_SRV      */
        "rpc_cli",           /* DBGC_RPC_CLI      */
        "passdb",            /* DBGC_PASSDB       */
@@ -423,16 +423,16 @@ BOOL debug_parse_levels(const char *params_str)
        if (AllowDebugChange == False)
                return True;
 
-       params = lp_list_make(params_str);
+       params = str_list_make(params_str);
 
        if (debug_parse_params(params, DEBUGLEVEL_CLASS,
                               DEBUGLEVEL_CLASS_ISSET))
        {
                debug_dump_status(5);
-               lp_list_free(&params);
+               str_list_free(&params);
                return True;
        } else {
-               lp_list_free(&params);
+               str_list_free(&params);
                return False;
        }
 }
@@ -516,7 +516,7 @@ void debug_init(void)
  * get ready for syslog stuff
  * ************************************************************************** **
  */
-void setup_logging(char *pname, BOOL interactive)
+void setup_logging(const char *pname, BOOL interactive)
 {
        debug_init();
 
@@ -531,7 +531,7 @@ void setup_logging(char *pname, BOOL interactive)
        }
 #ifdef WITH_SYSLOG
        else {
-               char *p = strrchr_m( pname,'/' );
+               const char *p = strrchr_m( pname,'/' );
                if (p)
                        pname = p + 1;
 #ifdef LOG_DAEMON