+2005-04-06 Pierre Humblet <pierre.humblet@ieee.org>
+
+ * security.h (cygsidlist::addfromgr): Avoid duplicate entries.
+ * grp.cc (initgrousp): Add syscall_printf.
+ (setgroups): Add syscall_printf and make sure sids are added only once.
+
2005-04-06 Christopher Faylor <cgf@timesys.com>
* net.cc (cygwin_getservbyname): Return (possibly NULL) return value of
}
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));
}
extern "C" int
setgroups32 (int ngroups, const __gid32_t *grouplist)
{
+ syscall_printf ("setgroups32 (%d)", ngroups);
if (ngroups < 0 || (ngroups > 0 && !grouplist))
{
set_errno (EINVAL);
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;
BOOL add (const char *sidstr)
{ cygsid nsi (sidstr); return add (nsi); }
BOOL addfromgr (struct __group32 *gr) /* Only with alloc */
- { return sids[count++].getfromgr (gr); }
+ { return sids[count].getfromgr (gr)
+ && (contains (sids[count]) || ++count); }
BOOL operator+= (cygsid &si) { return add (si); }
BOOL operator+= (const char *sidstr) { return add (sidstr); }