From 0310697963dd248504d1bf4c0bd4d98a5086bb14 Mon Sep 17 00:00:00 2001
From: Tim Potter <tpot@samba.org>
Date: Thu, 30 Jan 2003 04:00:28 +0000
Subject: Move debug level message handling into debug.c from messages.c

Removed duplicate message_register() for REQ_DEBUGLEVEL message.
(This used to be commit 6fee7196d695ca813a301b1e6d7da687b7e7bda5)
---
 source3/lib/debug.c    | 14 ++++++++++++++
 source3/lib/messages.c | 11 -----------
 2 files changed, 14 insertions(+), 11 deletions(-)

(limited to 'source3')

diff --git a/source3/lib/debug.c b/source3/lib/debug.c
index 223bf8ebc2..dc675037a0 100644
--- a/source3/lib/debug.c
+++ b/source3/lib/debug.c
@@ -467,6 +467,20 @@ void debug_message_send(pid_t pid, const char *params_str)
 			 False);
 }
 
+/****************************************************************************
+ Return current debug level.
+****************************************************************************/
+
+static void debuglevel_message(int msg_type, pid_t src, void *buf, size_t len)
+{
+	char *message = debug_list_class_names_and_levels();
+
+	DEBUG(1,("INFO: Received REQ_DEBUGLEVEL message from PID %u\n",(unsigned int)src));
+	message_send_pid(src, MSG_DEBUGLEVEL, message, strlen(message) + 1, True);
+
+	SAFE_FREE(message);
+}
+
 /****************************************************************************
 Init debugging (one time stuff)
 ****************************************************************************/
diff --git a/source3/lib/messages.c b/source3/lib/messages.c
index 38c3c411d4..53c9e3d2bc 100644
--- a/source3/lib/messages.c
+++ b/source3/lib/messages.c
@@ -90,16 +90,6 @@ static void ping_message(int msg_type, pid_t src, void *buf, size_t len)
 	message_send_pid(src, MSG_PONG, buf, len, True);
 }
 
-/****************************************************************************
- Return current debug level.
-****************************************************************************/
-
-void debuglevel_message(int msg_type, pid_t src, void *buf, size_t len)
-{
-	DEBUG(1,("INFO: Received REQ_DEBUGLEVEL message from PID %u\n",(unsigned int)src));
-	message_send_pid(src, MSG_DEBUGLEVEL, DEBUGLEVEL_CLASS, sizeof(DEBUGLEVEL_CLASS), True);
-}
-
 /****************************************************************************
  Initialise the messaging functions. 
 ****************************************************************************/
@@ -120,7 +110,6 @@ BOOL message_init(void)
 	CatchSignal(SIGUSR1, SIGNAL_CAST sig_usr1);
 
 	message_register(MSG_PING, ping_message);
-	message_register(MSG_REQ_DEBUGLEVEL, debuglevel_message);
 
 	return True;
 }
-- 
cgit