X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fgetugroups.c;h=b266bb8c320108144069dcc1066c007224da52bf;hb=e8e63d1b31bca6c82713cba490b21a861abb24b5;hp=b5e26877787168c898ea88d69e773ac6b70e5802;hpb=83bac006af8beaec5c6f7ca46bc5110ff3090f89;p=gnulib.git
diff --git a/lib/getugroups.c b/lib/getugroups.c
index b5e268777..b266bb8c3 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,10 +1,11 @@
/* getugroups.c -- return a list of the groups a user is in
- Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003 Free Software Foundation.
- This program is free software; you can redistribute it and/or modify
+ Copyright (C) 1990, 1991, 1998-2000, 2003-2008 Free Software Foundation.
+
+ This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2, or (at your option)
- any later version.
+ the Free Software Foundation; either version 3 of the License, or
+ (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -12,28 +13,26 @@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */
+ along with this program. If not, see . */
/* Written by David MacKenzie. */
-#ifdef HAVE_CONFIG_H
-# include
-#endif
+#include
+
+#include "getugroups.h"
-#include
+#include
#include /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
#include
-#ifdef HAVE_UNISTD_H
-# include
-#endif
+#include
+
+#include
-/* setgrent, getgrent, and endgrent are not specified by POSIX.1,
- so header files might not declare them.
+/* Some old header files might not declare setgrent, getgrent, and endgrent.
If you don't have them at all, we can't implement this function.
You lose! */
-struct group *getgrent ();
+struct group *getgrent (void);
#include
@@ -43,15 +42,14 @@ struct group *getgrent ();
process. Store at most MAXCOUNT group IDs in the GROUPLIST array.
If GID is not -1, store it first (if possible). GID should be the
group ID (pw_gid) obtained from getpwuid, in case USERNAME is not
- listed in /etc/groups.
- Always return the number of groups of which USERNAME is a member. */
+ listed in /etc/groups. Upon failure, set errno and return -1.
+ Otherwise, return the number of IDs we've written into GROUPLIST. */
int
-getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
+getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
+ gid_t gid)
{
- struct group *grp;
- register char **cp;
- register int count = 0;
+ int count = 0;
if (gid != (gid_t) -1)
{
@@ -61,8 +59,16 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
}
setgrent ();
- while ((grp = getgrent ()) != 0)
+ while (1)
{
+ char **cp;
+ struct group *grp;
+
+ errno = 0;
+ grp = getgrent ();
+ if (grp == NULL)
+ break;
+
for (cp = grp->gr_mem; *cp; ++cp)
{
int n;
@@ -81,17 +87,28 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
if (maxcount != 0)
{
if (count >= maxcount)
- {
- endgrent ();
- return count;
- }
+ goto done;
grouplist[count] = grp->gr_gid;
}
+ if (count == INT_MAX)
+ {
+ errno = EOVERFLOW;
+ goto done;
+ }
count++;
}
}
}
- endgrent ();
+
+ if (errno != 0)
+ count = -1;
+
+ done:
+ {
+ int saved_errno = errno;
+ endgrent ();
+ errno = saved_errno;
+ }
return count;
}