The branch, master has been updated
via 6ee03a2bd9b s3:winbind: Improve logging for query_user_list()
from b4ce96bdcd8 s3-client: Use the passed down memory context for
cli_connect_nb()
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6ee03a2bd9b4db5eabfa6cd9a5fac63353dc5f1c
Author: Andreas Schneider <[email protected]>
Date: Wed Nov 5 12:28:39 2025 +0100
s3:winbind: Improve logging for query_user_list()
Signed-off-by: Andreas Schneider <[email protected]>
Reviewed-by: Volker Lendecke <[email protected]>
Autobuild-User(master): Volker Lendecke <[email protected]>
Autobuild-Date(master): Fri Nov 7 16:06:50 UTC 2025 on atb-devel-224
-----------------------------------------------------------------------
Summary of changes:
source3/winbindd/winbindd_ads.c | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 42b8df2623d..bb5e664a032 100644
--- a/source3/winbindd/winbindd_ads.c
+++ b/source3/winbindd/winbindd_ads.c
@@ -337,17 +337,24 @@ static NTSTATUS query_user_list(struct winbindd_domain
*domain,
ok = ads_pull_uint32(ads, msg, "sAMAccountType", &atype);
if (!ok) {
- DBG_INFO("Object lacks sAMAccountType attribute\n");
+ char *dn = ads_get_dn(ads, talloc_tos(), msg);
+ DBG_INFO("Object %s lacks sAMAccountType attribute\n",
+ dn == NULL ? "(null)" : dn);
+ TALLOC_FREE(dn);
continue;
}
if (ds_atype_map(atype) != SID_NAME_USER) {
- DBG_INFO("Not a user account? atype=0x%x\n", atype);
+ char *dn = ads_get_dn(ads, talloc_tos(), msg);
+ DBG_INFO("Object %s not a user account? atype=0x%x\n",
+ dn == NULL ? "(null)" : dn, atype);
+ TALLOC_FREE(dn);
continue;
}
if (!ads_pull_sid(ads, msg, "objectSid", &user_sid)) {
char *dn = ads_get_dn(ads, talloc_tos(), msg);
- DBG_INFO("No sid for %s !?\n", dn);
+ DBG_INFO("No sid for %s !?\n",
+ dn == NULL ? "(null)" : dn);
TALLOC_FREE(dn);
continue;
}
--
Samba Shared Repository
