The branch, master has been updated
via e4e3f05cd7d s3:winbindd: call process_set_title() for locator child
via 923df3c3f53 s3:cli_netlogon: don't change remote_name in
rpccli_setup_netlogon_creds_locked()
from efbbe8d6f80 smbd: fix breaking leases on rename
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit e4e3f05cd7d6fdc98a24f592a099f7d24136788d
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
commit 923df3c3f53fc5998f6535f7930a29208ced282d
Author: Stefan Metzmacher <[email protected]>
Date: Wed Oct 30 13:33:45 2024 +0000
s3:cli_netlogon: don't change remote_name in
rpccli_setup_netlogon_creds_locked()
This was missing in commit 628d7b6f2e626c9c530473d06c038dfec9cbd17a.
We should not alter the name to '<UNKNOWN>'!
Signed-off-by: Stefan Metzmacher <[email protected]>
Reviewed-by: Ralph Boehme <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
source3/rpc_client/cli_netlogon.c | 6 ------
source3/winbindd/winbindd_dual.c | 2 ++
source3/winbindd/winbindd_locator.c | 9 +++++++++
source3/winbindd/winbindd_proto.h | 1 +
4 files changed, 12 insertions(+), 6 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/rpc_client/cli_netlogon.c
b/source3/rpc_client/cli_netlogon.c
index f871c573d7d..2c79aa5a4e6 100644
--- a/source3/rpc_client/cli_netlogon.c
+++ b/source3/rpc_client/cli_netlogon.c
@@ -181,12 +181,6 @@ static NTSTATUS rpccli_setup_netlogon_creds_locked(
action = "overwrite";
}
- if (cli != NULL) {
- remote_name = smbXcli_conn_remote_name(cli->conn);
- } else {
- remote_name = "<UNKNOWN>";
- }
-
DEBUG(5,("%s: %s cached netlogon_creds cli[%s/%s] to %s\n",
__FUNCTION__, action,
creds->account_name, creds->computer_name,
diff --git a/source3/winbindd/winbindd_dual.c b/source3/winbindd/winbindd_dual.c
index 7582c0606e4..614727aceb9 100644
--- a/source3/winbindd/winbindd_dual.c
+++ b/source3/winbindd/winbindd_dual.c
@@ -1788,6 +1788,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 acfbc0543fa..5b90a7a731f 100644
--- a/source3/winbindd/winbindd_proto.h
+++ b/source3/winbindd/winbindd_proto.h
@@ -414,6 +414,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
