r805: Fix to stop smbd hanging on missing group member from "Jianliang Lu" <j.lu...

Jeremy.

diff --git a/source/rpc_server/srv_samr_nt.c b/source/rpc_server/srv_samr_nt.c
index eca0913c1c239cf71f5087298178ab5bf334a8e3..ea631d7c851e2f87799e31a1a4be17ab7133892e 100644 (file)
--- a/source/rpc_server/srv_samr_nt.c
+++ b/source/rpc_server/srv_samr_nt.c
@@ -3295,16 +3295,12 @@ static BOOL get_memberuids(gid_t gid, uid_t **uids, int *num)
 
        /* Secondary group members */
 
-       gr = grp->gr_mem;
-       while ((*gr != NULL) && ((*gr)[0] != '\0')) {
+       for (gr = grp->gr_mem; (*gr != NULL) && ((*gr)[0] != '\0'); gr += 1) {
                struct passwd *pw = getpwnam(*gr);
 
                if (pw == NULL)
                        continue;
-
                add_uid_to_array_unique(pw->pw_uid, uids, num);
-
-               gr += 1;
        }
 
        winbind_on();