r9361: patch from Ed Plese to fix a faulty error in winbindd

caused by users with no supplementary groups.

diff --git a/source/nsswitch/winbindd_ads.c b/source/nsswitch/winbindd_ads.c
index 50899714475f6e2c15d565eefaa99b0f8858c256..a7849e59b16b976c1310ea126910453936ab6fb3 100644 (file)
--- a/source/nsswitch/winbindd_ads.c
+++ b/source/nsswitch/winbindd_ads.c
@@ -499,28 +499,27 @@ static NTSTATUS lookup_usergroups_alt(struct winbindd_domain *domain,
        }
        
        count = ads_count_replies(ads, res);
-       if (count == 0) {
-               DEBUG(5,("lookup_usergroups: No supp groups found\n"));
-               
-               status = ads_ntstatus(rc);
-               goto done;
-       }
        
        *user_sids = NULL;
        *num_groups = 0;
 
+       /* always add the primary group to the sid array */
        add_sid_to_array(mem_ctx, primary_group, user_sids, num_groups);
 
-       for (msg = ads_first_entry(ads, res); msg;
-            msg = ads_next_entry(ads, msg)) {
-               DOM_SID group_sid;
+       if (count > 0) {
+               for (msg = ads_first_entry(ads, res); msg;
+                    msg = ads_next_entry(ads, msg)) {
+                       DOM_SID group_sid;
                
-               if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) {
-                       DEBUG(1,("No sid for this group ?!?\n"));
-                       continue;
+                       if (!ads_pull_sid(ads, msg, "objectSid", &group_sid)) {
+                               DEBUG(1,("No sid for this group ?!?\n"));
+                               continue;
+                       }
+
+                       add_sid_to_array(mem_ctx, &group_sid, user_sids,
+                                        num_groups);
                }
 
-               add_sid_to_array(mem_ctx, &group_sid, user_sids, num_groups);
        }
 
        status = (user_sids != NULL) ? NT_STATUS_OK : NT_STATUS_NO_MEMORY;