From: Stefan Metzmacher <metze@samba.org>
Date: Fri, 11 Sep 2020 12:06:04 +0000 (+0200)
Subject: winbindd: add and use idmap_child_pid()
X-Git-Tag: talloc-2.3.2~170
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2103543629004a3a22e7bf60305bb15bf3b316be;p=thirdparty%2Fsamba.git

winbindd: add and use idmap_child_pid()

We should avoid calling idmap_child() as much as possible.

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

Signed-off-by: Stefan Metzmacher <metze@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>
---

diff --git a/source3/winbindd/winbindd_cm.c b/source3/winbindd/winbindd_cm.c
index 344eac2804b..e7399434536 100644
--- a/source3/winbindd/winbindd_cm.c
+++ b/source3/winbindd/winbindd_cm.c
@@ -464,11 +464,11 @@ void set_domain_offline(struct winbindd_domain *domain)
 	   primary domain goes offline */
 
 	if ( domain->primary ) {
-		struct winbindd_child *idmap = idmap_child();
+		pid_t idmap_pid = idmap_child_pid();
 
-		if ( idmap->pid != 0 ) {
+		if (idmap_pid != 0) {
 			messaging_send_buf(global_messaging_context(),
-					   pid_to_procid(idmap->pid), 
+					   pid_to_procid(idmap_pid),
 					   MSG_WINBIND_OFFLINE, 
 					   (const uint8_t *)domain->name,
 					   strlen(domain->name)+1);
@@ -550,11 +550,11 @@ static void set_domain_online(struct winbindd_domain *domain)
 	   primary domain comes online */
 
 	if ( domain->primary ) {
-		struct winbindd_child *idmap = idmap_child();
+		pid_t idmap_pid = idmap_child_pid();
 
-		if ( idmap->pid != 0 ) {
+		if (idmap_pid != 0) {
 			messaging_send_buf(global_messaging_context(),
-					   pid_to_procid(idmap->pid), 
+					   pid_to_procid(idmap_pid),
 					   MSG_WINBIND_ONLINE, 
 					   (const uint8_t *)domain->name,
 					   strlen(domain->name)+1);
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 0187d232640..ba3f79efa8c 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1039,11 +1039,11 @@ void winbind_msg_online(struct messaging_context *msg_ctx,
 		   primary domain comes back online */
 
 		if ( domain->primary ) {
-			struct winbindd_child *idmap = idmap_child();
+			pid_t idmap_pid = idmap_child_pid();
 
-			if ( idmap->pid != 0 ) {
+			if (idmap_pid != 0) {
 				messaging_send_buf(msg_ctx,
-						   pid_to_procid(idmap->pid), 
+						   pid_to_procid(idmap_pid),
 						   MSG_WINBIND_ONLINE,
 						   (const uint8_t *)domain->name,
 						   strlen(domain->name)+1);
diff --git a/source3/winbindd/winbindd_idmap.c b/source3/winbindd/winbindd_idmap.c
index 2ee436bc7dc..965a7839f17 100644
--- a/source3/winbindd/winbindd_idmap.c
+++ b/source3/winbindd/winbindd_idmap.c
@@ -34,6 +34,11 @@ struct winbindd_child *idmap_child(void)
 	return &static_idmap_child;
 }
 
+pid_t idmap_child_pid(void)
+{
+	return static_idmap_child.pid;
+}
+
 struct dcerpc_binding_handle *idmap_child_handle(void)
 {
 	return static_idmap_child.binding_handle;
diff --git a/source3/winbindd/winbindd_proto.h b/source3/winbindd/winbindd_proto.h
index 2a829b0171a..0476dd52998 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -359,6 +359,7 @@ NTSTATUS winbindd_print_groupmembers(struct db_context *members,
 
 void init_idmap_child(void);
 struct winbindd_child *idmap_child(void);
+pid_t idmap_child_pid(void);
 struct dcerpc_binding_handle *idmap_child_handle(void);
 struct idmap_domain *idmap_find_domain_with_sid(const char *domname,
 						const struct dom_sid *sid);