X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgetugroups.c;h=7aa540db79d8ad3e449b6808585c112796bb661d;hb=fc86a0be1b68e4b24d9249d763d33701b3a81623;hp=2be31ecb2545d22ed0d1023c7cbe374a8539ea16;hpb=f83aa1c44165db4017fab31791eddd64be9b62ad;p=gnulib.git

diff --git a/lib/getugroups.c b/lib/getugroups.c
index 2be31ecb2..7aa540db7 100644
--- a/lib/getugroups.c
+++ b/lib/getugroups.c
@@ -1,5 +1,7 @@
 /* getugroups.c -- return a list of the groups a user is in
-   Copyright (C) 1990, 1991, 1998, 1999, 2000 Free Software Foundation.
+
+   Copyright (C) 1990, 1991, 1998, 1999, 2000, 2003, 2004, 2005 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
@@ -13,7 +15,7 @@
 
    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.  */
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
 
 /* Written by David MacKenzie. */
 
@@ -25,8 +27,11 @@
 #include <stdio.h> /* grp.h on alpha OSF1 V2.0 uses "FILE *". */
 #include <grp.h>
 
-#ifdef HAVE_UNISTD_H
-# include <unistd.h>
+#include <unistd.h>
+
+#include <errno.h>
+#ifndef EOVERFLOW
+# define EOVERFLOW EINVAL
 #endif
 
 /* setgrent, getgrent, and endgrent are not specified by POSIX.1,
@@ -35,11 +40,7 @@
    You lose!  */
 struct group *getgrent ();
 
-#if defined(STDC_HEADERS) || defined(HAVE_STRING_H)
-# include <string.h>
-#else
-# include <strings.h>
-#endif
+#include <string.h>
 
 #define STREQ(s1, s2) ((strcmp (s1, s2) == 0))
 
@@ -92,6 +93,11 @@ getugroups (int maxcount, GETGROUPS_T *grouplist, char *username, gid_t gid)
 		  grouplist[count] = grp->gr_gid;
 		}
 	      count++;
+	      if (count < 0)
+		{
+		  errno = EOVERFLOW;
+		  return -1;
+		}
 	    }
 	}
     }