s3:winbind: Improve logging for query_user_list()

Signed-off-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Volker Lendecke <vl@samba.org>
Autobuild-User(master): Volker Lendecke <vl@samba.org>
Autobuild-Date(master): Fri Nov  7 16:06:50 UTC 2025 on atb-devel-224

diff --git a/source3/winbindd/winbindd_ads.c b/source3/winbindd/winbindd_ads.c
index 42b8df2623d5e4586c17b88f4745451ddaa4a762..bb5e664a032d894d0dbe536826a0245efdfed71c 100644 (file)
--- 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) {
 
                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) {
                        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);
                        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;
                }
                        TALLOC_FREE(dn);
                        continue;
                }