[PATCH] Remove unused DUMP_EVENT_LIST code

Volker Lendecke Volker.Lendecke at SerNet.DE
Mon Feb 26 10:05:40 UTC 2018


Hi!

Review appreciated!

Thanks, Volker

-- 
Besuchen Sie die verinice.XP 2018 in Berlin,
Anwenderkonferenz für Informationssicherheit
vom 21.-23.03.2018 im Sofitel Kurfürstendamm
Info & Anmeldung hier: http://veriniceXP.org

SerNet GmbH, Bahnhofsallee 1b, 37081 Göttingen
phone: +49-551-370000-0, fax: +49-551-370000-9
AG Göttingen, HRB 2816, GF: Dr. Johannes Loxen
http://www.sernet.de, mailto:kontakt at sernet.de
-------------- next part --------------
From c05e185189adf1829d0290edc2eee9e791f2daa9 Mon Sep 17 00:00:00 2001
From: Volker Lendecke <vl at samba.org>
Date: Mon, 26 Feb 2018 11:04:31 +0100
Subject: [PATCH] winbindd: Remove "DUMP_EVENT_LIST" message

This was no longer implemented, remove it completely

Signed-off-by: Volker Lendecke <vl at samba.org>
---
 librpc/idl/messaging.idl         |  2 +-
 source3/utils/smbcontrol.c       | 14 --------------
 source3/winbindd/winbindd.c      |  3 ---
 source3/winbindd/winbindd_dual.c | 38 --------------------------------------
 4 files changed, 1 insertion(+), 56 deletions(-)

diff --git a/librpc/idl/messaging.idl b/librpc/idl/messaging.idl
index b35f1e1e9ae..5468334b77b 100644
--- a/librpc/idl/messaging.idl
+++ b/librpc/idl/messaging.idl
@@ -126,7 +126,7 @@ interface messaging
 		MSG_WINBIND_RELOAD_TRUSTED_DOMAINS = 0x040D,
 
 		/* event messages */
-		MSG_DUMP_EVENT_LIST		= 0x0500,
+		/* MSG_DUMP_EVENT_LIST		= 0x0500, Obsoleted */
 
 		/* smbXsrv messages */
 		MSG_SMBXSRV_SESSION_CLOSE	= 0x0600,
diff --git a/source3/utils/smbcontrol.c b/source3/utils/smbcontrol.c
index c4b56305217..4ecfb3e6dff 100644
--- a/source3/utils/smbcontrol.c
+++ b/source3/utils/smbcontrol.c
@@ -1184,19 +1184,6 @@ static bool do_winbind_onlinestatus(struct tevent_context *ev_ctx,
 	return num_replies;
 }
 
-static bool do_dump_event_list(struct tevent_context *ev_ctx,
-			       struct messaging_context *msg_ctx,
-			       const struct server_id pid,
-			       const int argc, const char **argv)
-{
-	if (argc != 1) {
-		fprintf(stderr, "Usage: smbcontrol <dest> dump-event-list\n");
-		return False;
-	}
-
-	return send_message(msg_ctx, pid, MSG_DUMP_EVENT_LIST, NULL, 0);
-}
-
 static bool do_winbind_dump_domain_list(struct tevent_context *ev_ctx,
 					struct messaging_context *msg_ctx,
 					const struct server_id pid,
@@ -1412,7 +1399,6 @@ static const struct {
 	{ "online", do_winbind_online, "Ask winbind to go into online state"},
 	{ "offline", do_winbind_offline, "Ask winbind to go into offline state"},
 	{ "onlinestatus", do_winbind_onlinestatus, "Request winbind online status"},
-	{ "dump-event-list", do_dump_event_list, "Dump event list"},
 	{ "validate-cache" , do_winbind_validate_cache,
 	  "Validate winbind's credential cache" },
 	{ "dump-domain-list", do_winbind_dump_domain_list, "Dump winbind domain list"},
diff --git a/source3/winbindd/winbindd.c b/source3/winbindd/winbindd.c
index 9611f737378..81b86df2ffa 100644
--- a/source3/winbindd/winbindd.c
+++ b/source3/winbindd/winbindd.c
@@ -1330,9 +1330,6 @@ static void winbindd_register_handlers(struct messaging_context *msg_ctx,
 			   MSG_WINBIND_DOMAIN_ONLINE, winbind_msg_domain_online);
 
 	messaging_register(msg_ctx, NULL,
-			   MSG_DUMP_EVENT_LIST, winbind_msg_dump_event_list);
-
-	messaging_register(msg_ctx, NULL,
 			   MSG_WINBIND_VALIDATE_CACHE,
 			   winbind_msg_validate_cache);
 
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 874d556a315..fa34e7363ef 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -973,30 +973,6 @@ void winbind_msg_onlinestatus(struct messaging_context *msg_ctx,
 	talloc_destroy(mem_ctx);
 }
 
-void winbind_msg_dump_event_list(struct messaging_context *msg_ctx,
-				 void *private_data,
-				 uint32_t msg_type,
-				 struct server_id server_id,
-				 DATA_BLOB *data)
-{
-	struct winbindd_child *child;
-
-	DEBUG(10,("winbind_msg_dump_event_list received\n"));
-
-	DBG_WARNING("dump event list no longer implemented\n");
-
-	for (child = winbindd_children; child != NULL; child = child->next) {
-
-		DEBUG(10,("winbind_msg_dump_event_list: sending message to pid %u\n",
-			(unsigned int)child->pid));
-
-		messaging_send_buf(msg_ctx, pid_to_procid(child->pid),
-				   MSG_DUMP_EVENT_LIST,
-				   NULL, 0);
-	}
-
-}
-
 void winbind_msg_dump_domain_list(struct messaging_context *msg_ctx,
 				  void *private_data,
 				  uint32_t msg_type,
@@ -1373,16 +1349,6 @@ static void child_msg_online(struct messaging_context *msg,
 	}
 }
 
-static void child_msg_dump_event_list(struct messaging_context *msg,
-				      void *private_data,
-				      uint32_t msg_type,
-				      struct server_id server_id,
-				      DATA_BLOB *data)
-{
-	DEBUG(5,("child_msg_dump_event_list received\n"));
-	DBG_WARNING("dump_event_list no longer implemented\n");
-}
-
 NTSTATUS winbindd_reinit_after_fork(const struct winbindd_child *myself,
 				    const char *logfilename)
 {
@@ -1427,8 +1393,6 @@ NTSTATUS winbindd_reinit_after_fork(const struct winbindd_child *myself,
 	messaging_deregister(server_messaging_context(),
 			     MSG_WINBIND_ONLINESTATUS, NULL);
 	messaging_deregister(server_messaging_context(),
-			     MSG_DUMP_EVENT_LIST, NULL);
-	messaging_deregister(server_messaging_context(),
 			     MSG_WINBIND_DUMP_DOMAIN_LIST, NULL);
 	messaging_deregister(server_messaging_context(),
 			     MSG_DEBUG, NULL);
@@ -1644,8 +1608,6 @@ static bool fork_domain_child(struct winbindd_child *child)
 	messaging_register(server_messaging_context(), NULL,
 			   MSG_WINBIND_ONLINE, child_msg_online);
 	messaging_register(server_messaging_context(), NULL,
-			   MSG_DUMP_EVENT_LIST, child_msg_dump_event_list);
-	messaging_register(server_messaging_context(), NULL,
 			   MSG_DEBUG, debug_message);
 	messaging_register(server_messaging_context(), NULL,
 			   MSG_WINBIND_IP_DROPPED,
-- 
2.11.0



More information about the samba-technical mailing list