The branch, v4-20-test has been updated
via cc3a1195855 s3:winbindd: call process_set_title() for locator child
from 81f92c8a62f third_party/heimdal: Import
lorikeet-heimdal-202410161454 (commit 0d61538a16b5051c820702f0711102112cd01a83)
https://git.samba.org/?p=samba.git;a=shortlog;h=v4-20-test
- Log -----------------------------------------------------------------
commit cc3a11958552a492017e29cae3b443535191184c
Author: Stefan Metzmacher <[email protected]>
Date: Wed Oct 16 07:45:21 2024 +0000
s3:winbindd: call process_set_title() for locator child
BUG: https://bugzilla.samba.org/show_bug.cgi?id=15749
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
Autobuild-User(master): Stefan Metzmacher <[email protected]>
Autobuild-Date(master): Thu Oct 31 14:02:39 UTC 2024 on atb-devel-224
(cherry picked from commit e4e3f05cd7d6fdc98a24f592a099f7d24136788d)
Autobuild-User(v4-20-test): Jule Anger <[email protected]>
Autobuild-Date(v4-20-test): Thu Nov 7 13:39:23 UTC 2024 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_dual.c | 2 ++
source3/winbindd/winbindd_locator.c | 9 +++++++++
source3/winbindd/winbindd_proto.h | 1 +
3 files changed, 12 insertions(+)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 5f3239cec18..b8e1ceddecc 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1790,6 +1790,8 @@ static bool fork_domain_child(struct winbindd_child
*child)
process_set_title("wb[%s]", "domain child [%s]",
child_domain->name);
} else if (is_idmap_child(child)) {
process_set_title("wb-idmap", "idmap child");
+ } else if (is_locator_child(child)) {
+ process_set_title("wb-locator", "locator child");
}
/* Handle online/offline messages. */
diff --git a/source3/winbindd/winbindd_locator.c
b/source3/winbindd/winbindd_locator.c
index c915bf280c4..277a68bbbd8 100644
--- a/source3/winbindd/winbindd_locator.c
+++ b/source3/winbindd/winbindd_locator.c
@@ -34,6 +34,15 @@ struct winbindd_child *locator_child(void)
return static_locator_child;
}
+bool is_locator_child(const struct winbindd_child *child)
+{
+ if (child == static_locator_child) {
+ return true;
+ }
+
+ return false;
+}
+
struct dcerpc_binding_handle *locator_child_handle(void)
{
return static_locator_child->binding_handle;
diff --git a/source3/winbindd/winbindd_proto.h
b/source3/winbindd/winbindd_proto.h
index a5e8c8b8df8..4dee9b046cf 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -407,6 +407,7 @@ bool lp_scan_idmap_domains(bool (*fn)(const char *domname,
NTSTATUS init_locator_child(TALLOC_CTX *mem_ctx);
struct winbindd_child *locator_child(void);
+bool is_locator_child(const struct winbindd_child *child);
struct dcerpc_binding_handle *locator_child_handle(void);
/* The following definitions come from winbindd/winbindd_misc.c */
--
Samba Shared Repository
