Changeset 39 for trunk/samba/source/nsswitch/winbindd_user.c

Timestamp:

May 27, 2007, 12:26:26 AM (18 years ago)

Author:

Paul Smedley

Message:

Upgrade source to 3.0.25a

File:

• trunk/samba/source/nsswitch/winbindd_user.c (modified) (5 diffs)

trunk/samba/source/nsswitch/winbindd_user.c

@@ -632 +632 @@
         struct getent_state *ent;
         struct winbindd_pw *user_list;
-        int num_users, user_list_ndx = 0, i;
+        int num_users, user_list_ndx;
 
         DEBUG(3, ("[%5lu]: getpwent\n", (unsigned long)state->pid));
@@ -646 +646 @@
 
         num_users = MIN(MAX_GETPWENT_USERS, state->request.data.num_entries);
+
+        if (num_users == 0) {
+                request_error(state);
+                return;
+        }
         
         if ((state->response.extra_data.data = SMB_MALLOC_ARRAY(struct winbindd_pw, num_users)) == NULL) {
@@ -667 +672 @@
         /* Start sending back users */
 
-        for (i = 0; i < num_users; i++) {
+        for (user_list_ndx = 0; user_list_ndx < num_users; ) {
                 struct getpwent_user *name_list = NULL;
                 uint32 result;
@@ -710 +715 @@
                         &user_list[user_list_ndx]);
                 
-                ent->sam_entry_index++;
-                
                 /* Add user to return list */
                 
@@ -724 +727 @@
                         DEBUG(1, ("could not lookup domain user %s\n",
                                   name_list[ent->sam_entry_index].name));
+
+                ent->sam_entry_index++;
+                
         }