X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=6c557cdf341fa55c5d9c2e338a4f3910a34b9552;hb=6cad9c91215eac0f90bbb1f9473ea0f5fce3b085;hp=43d0650a0f5ee086b157c3aa46b3cf978495cf52;hpb=72c48440c1f459e2659270598b771c69e9c08994;p=gnulib.git

diff --git a/lib/getugroups.c b/lib/getugroups.c
index 43d0650a0..6c557cdf3 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -2,10 +2,10 @@
 
    Copyright (C) 1990, 1991, 1998-2000, 2003-2007 Free Software Foundation.
 
-   This program is free software; you can redistribute it and/or modify
+   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
@@ -13,8 +13,7 @@
    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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 /* Written by David MacKenzie. */
 
@@ -45,14 +44,13 @@ 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 const *username,
 	    gid_t gid)
 {
-  struct group *grp;
   int count = 0;
 
   if (gid != (gid_t) -1)
@@ -63,9 +61,16 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
     }
 
   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;
@@ -91,13 +96,15 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char const *username,
 	      if (count < 0)
 		{
 		  errno = EOVERFLOW;
-		  count = -1;
 		  goto done;
 		}
 	    }
 	}
     }
 
+  if (errno != 0)
+    count = -1;
+
  done:
   {
     int saved_errno = errno;