smbd: Use common function for FORCE_DIS and KILL_CLIENT_IP in parent

The parent smbd process only forwards the message to the child
processes. Use a common function instead of two separate ones that do
the same thing.

Signed-off-by: Christof Schmitt <cs@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>

diff --git a/source3/smbd/server.c b/source3/smbd/server.c
index 40684adae1c9f429f4f56bd8a6599820cf2cb051..0b54bc7064599e415f9a71b2bbb5abccefb95f0f 100644 (file)
--- a/source3/smbd/server.c
+++ b/source3/smbd/server.c
@@ -216,6 +216,15 @@ NTSTATUS messaging_send_to_children(struct messaging_context *msg_ctx,
        return NT_STATUS_OK;
 }
 
+static void smb_parent_send_to_children(struct messaging_context *ctx,
+                                       void* data,
+                                       uint32_t msg_type,
+                                       struct server_id srv_id,
+                                       DATA_BLOB* msg_data)
+{
+       messaging_send_to_children(ctx, msg_type, msg_data);
+}
+
 /*
  * Parent smbd process sets its own debug level first and then
  * sends a message to all the smbd children to adjust their debug
@@ -361,26 +370,6 @@ static void smbd_parent_notify_proxy_done(struct tevent_req *req)
        DEBUG(1, ("notify proxy job ended with %s\n", strerror(ret)));
 }
 
-static void smb_parent_force_tdis(struct messaging_context *ctx,
-                                 void* data,
-                                 uint32_t msg_type,
-                                 struct server_id srv_id,
-                                 DATA_BLOB* msg_data)
-{
-       messaging_send_to_children(ctx, msg_type, msg_data);
-}
-
-static void smb_parent_kill_client_by_ip(struct messaging_context *ctx,
-                                        void *data,
-                                        uint32_t msg_type,
-                                        struct server_id srv_id,
-                                        DATA_BLOB* msg_data)
-{
-       if (am_parent) {
-               messaging_send_to_children(ctx, msg_type, msg_data);
-       }
-}
-
 static void add_child_pid(struct smbd_parent_context *parent,
                          pid_t pid)
 {
@@ -910,9 +899,9 @@ static bool open_sockets_smbd(struct smbd_parent_context *parent,
        messaging_register(msg_ctx, NULL, MSG_SMB_BRL_VALIDATE,
                           brl_revalidate);
        messaging_register(msg_ctx, NULL, MSG_SMB_FORCE_TDIS,
-                          smb_parent_force_tdis);
+                          smb_parent_send_to_children);
        messaging_register(msg_ctx, NULL, MSG_SMB_KILL_CLIENT_IP,
-                          smb_parent_kill_client_by_ip);
+                          smb_parent_send_to_children);
        messaging_register(msg_ctx, NULL, MSG_SMB_TELL_NUM_CHILDREN,
                           smb_tell_num_children);