JehanneOS/newlib
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* security.h (cygsidlist::addfromgr): Avoid duplicate entries.

Browse Source 
* grp.cc (initgrousp): Add syscall_printf.
	(setgroups): Add syscall_printf and make sure sids are added only once.
This commit is contained in:
Corinna Vinschen
2005-04-06 12:35:52 +00:00
parent dafef5e249
commit b62b8d7c80
3 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
winsup/cygwin/grp.cc
View File

@@ -448,15 +448,16 @@ getgroups (int gidsetsize, __gid16_t *grouplist)
}
extern "C" int
initgroups32 (const char *, __gid32_t)
initgroups32 (const char *name, __gid32_t gid)
{
if (wincap.has_security ())
cygheap->user.groups.clear_supp ();
syscall_printf ( "0 = initgroups (%s, %u)", name, gid);
return 0;
}
extern "C" int
initgroups (const char * name, __gid16_t gid)
initgroups (const char *name, __gid16_t gid)
{
return initgroups32 (name, gid16togid32(gid));
}
@@ -465,6 +466,7 @@ initgroups (const char * name, __gid16_t gid)
extern "C" int
setgroups32 (int ngroups, const __gid32_t *grouplist)
{
syscall_printf ("setgroups32 (%d)", ngroups);
if (ngroups < 0 || (ngroups > 0 && !grouplist))
{
set_errno (EINVAL);
@@ -482,18 +484,13 @@ setgroups32 (int ngroups, const __gid32_t *grouplist)
for (int gidx = 0; gidx < ngroups; ++gidx)
{
for (int gidy = 0; gidy < gidx; gidy++)
if (grouplist[gidy] == grouplist[gidx])
goto found; /* Duplicate */
if ((gr = internal_getgrgid (grouplist[gidx])) &&
gsids.addfromgr (gr))
goto found;
if ((gr = internal_getgrgid (grouplist[gidx]))
&& gsids.addfromgr (gr))
continue;
debug_printf ("No sid found for gid %d", grouplist[gidx]);
gsids.free_sids ();
set_errno (EINVAL);
return -1;
found:
continue;
}
cygheap->user.groups.update_supp (gsids);
return 0;