From 53ce2f7012d55e200082fa7bc04b27d9dcfcf706 Mon Sep 17 00:00:00 2001 From: Herb Lewis Date: Thu, 12 Oct 2000 17:58:40 +0000 Subject: [PATCH] lib/messages.c add debug print for receipt of PING and REQ_DEBUGLEVEL messages utils/smbcontrol.c allow "q" to exit interactive mode. Exit on error from message_init. (This used to be commit cda8c0439113dcce02a681b0aaddf69326c0ec9a) --- source3/lib/messages.c | 2 ++ source3/utils/smbcontrol.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/source3/lib/messages.c b/source3/lib/messages.c index 1b225b1ed30..53c911e8b03 100644 --- a/source3/lib/messages.c +++ b/source3/lib/messages.c @@ -70,6 +70,7 @@ a useful function for testing the message system ****************************************************************************/ void ping_message(int msg_type, pid_t src, void *buf, size_t len) { + DEBUG(1,("INFO: Received PING message from PID %d\n",src)); message_send_pid(src, MSG_PONG, buf, len); } @@ -80,6 +81,7 @@ void debuglevel_message(int msg_type, pid_t src, void *buf, size_t len) { int level; + DEBUG(1,("INFO: Received REQ_DEBUGLEVEL message from PID %d\n",src)); level = DEBUGLEVEL; message_send_pid(src, MSG_DEBUGLEVEL, &level, sizeof(int)); } diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c index dff0dd33004..57f6149bcdd 100644 --- a/source3/utils/smbcontrol.c +++ b/source3/utils/smbcontrol.c @@ -242,7 +242,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params) charset_initialise(); lp_load(servicesf,False,False,False); - message_init(); + if (!message_init()) exit(1); if (argc < 2) usage(True); @@ -277,6 +277,7 @@ static BOOL do_command(char *dest, char *msg_name, char *params) myargc++; } if (!myargc) break; + if (strequal(myargv[0],"q")) break; if (myargc < 2) usage(False); else if (!do_command(myargv[0],myargv[1],myargc > 2 ? myargv[2] : 0)) -- 2.11.4.GIT