From: Ralph Boehme <slow@samba.org>
Date: Wed, 20 Jan 2021 11:00:16 +0000 (+0100)
Subject: winbind: handle MSG_SMB_CONF_UPDATED in the winbinds children
X-Git-Tag: samba-4.12.12~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b9669863b81075b494f03bb146b7fea3df4e7de;p=thirdparty%2Fsamba.git

winbind: handle MSG_SMB_CONF_UPDATED in the winbinds children

BUG: https://bugzilla.samba.org/show_bug.cgi?id=14602

Signed-off-by: Ralph Boehme <slow@samba.org>
Reviewed-by: Jeremy Allison <jra@samba.org>
(cherry picked from commit 072ef48001710ed8326c83295f2d3cc301d27cfe)
---

diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 56b3dac6dec..9f14dfdb4f1 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -927,6 +927,16 @@ void winbind_disconnect_dc_parent(struct messaging_context *msg_ctx,
 	forall_children(winbind_msg_relay_fn, &state);
 }
 
+static void winbindd_msg_reload_services_child(struct messaging_context *msg,
+					       void *private_data,
+					       uint32_t msg_type,
+					       struct server_id server_id,
+					       DATA_BLOB *data)
+{
+	DBG_DEBUG("Got reload-config message\n");
+	winbindd_reload_services_file((const char *)private_data);
+}
+
 /* React on 'smbcontrol winbindd reload-config' in the same way as on SIGHUP*/
 void winbindd_msg_reload_services_parent(struct messaging_context *msg,
 					 void *private_data,
@@ -934,12 +944,20 @@ void winbindd_msg_reload_services_parent(struct messaging_context *msg,
 					 struct server_id server_id,
 					 DATA_BLOB *data)
 {
+	struct winbind_msg_relay_state state = {
+		.msg_ctx = msg,
+		.msg_type = msg_type,
+		.data = data,
+	};
+
 	DBG_DEBUG("Got reload-config message\n");
 
         /* Flush various caches */
 	winbindd_flush_caches();
 
 	winbindd_reload_services_file((const char *)private_data);
+
+	forall_children(winbind_msg_relay_fn, &state);
 }
 
 /* Set our domains as offline and forward the offline message to our children. */
@@ -1774,6 +1792,10 @@ static bool fork_domain_child(struct winbindd_child *child)
 	messaging_register(global_messaging_context(), NULL,
 			   MSG_WINBIND_DISCONNECT_DC,
 			   winbind_msg_disconnect_dc);
+	messaging_register(global_messaging_context(),
+			   override_logfile ? NULL : child->logfilename,
+			   MSG_SMB_CONF_UPDATED,
+			   winbindd_msg_reload_services_child);
 
 	primary_domain = find_our_domain();