* grp.cc (internal_getgroups): Handle properly tokens with

	no groups. Fix bug introduced on 2003-02-04.

diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index bdff5fa..aa1c4e2 100644 (file)
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,8 @@
+2003-02-17  Pierre Humblet  <pierre.humblet@ieee.org>
+
+       * grp.cc (internal_getgroups): Handle properly tokens with
+       no groups. Fix bug introduced on 2003-02-04.
+
 2003-02-16  Christopher Faylor  <cgf@redhat.com>
 
        * cygwin.din: Export all appropriate newlibc libm functions.  Sort.

diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc
index 2d385c6..a0d73ae 100644 (file)
--- a/winsup/cygwin/grp.cc
+++ b/winsup/cygwin/grp.cc
@@ -267,7 +267,6 @@ internal_getgroups (int gidsetsize, __gid32_t *grouplist, cygpsid * srchsid)
                  for (DWORD pg = 0; pg < groups->GroupCount; ++pg)
                    if ((cnt = (*srchsid == groups->Groups[pg].Sid)))
                      break;
-                 cnt = -1;
                }
              else
                for (int gidx = 0; (gr = internal_getgrent (gidx)); ++gidx)
@@ -293,8 +292,7 @@ internal_getgroups (int gidsetsize, __gid32_t *grouplist, cygpsid * srchsid)
        debug_printf ("%d = GetTokenInformation(NULL) %E", size);
       if (hToken != cygheap->user.token)
        CloseHandle (hToken);
-      if (cnt)
-       return cnt;
+      return cnt;
     }
 
   gid = myself->gid;