From afe13e845405e56077925c4f7af02691a265675f Mon Sep 17 00:00:00 2001 From: Corinna Vinschen Date: Tue, 18 Feb 2003 10:09:37 +0000 Subject: [PATCH] * grp.cc (internal_getgroups): Handle properly tokens with no groups. Fix bug introduced on 2003-02-04. --- winsup/cygwin/ChangeLog | 5 +++++ winsup/cygwin/grp.cc | 4 +--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog index bdff5fa25..aa1c4e245 100644 --- a/winsup/cygwin/ChangeLog +++ b/winsup/cygwin/ChangeLog @@ -1,3 +1,8 @@ +2003-02-17 Pierre Humblet + + * grp.cc (internal_getgroups): Handle properly tokens with + no groups. Fix bug introduced on 2003-02-04. + 2003-02-16 Christopher Faylor * cygwin.din: Export all appropriate newlibc libm functions. Sort. diff --git a/winsup/cygwin/grp.cc b/winsup/cygwin/grp.cc index 2d385c6ff..a0d73ae26 100644 --- 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;