[Pkg-shadow-commits] r2165 - in upstream/trunk: . src

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-06-13 21:29:13 +0000 (Fri, 13 Jun 2008)
New Revision: 2165

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/groups.c
Log:
	* src/groups.c: sys_ngroups is only used when HAVE_GETGROUPS is
	defined.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-06-13 21:28:11 UTC (rev 2164)
+++ upstream/trunk/ChangeLog	2008-06-13 21:29:13 UTC (rev 2165)
@@ -1,5 +1,10 @@
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/groups.c: sys_ngroups is only used when HAVE_GETGROUPS is
+	defined.
+
+2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/faillog.c: Ignore return value of time() when use with a
 	non NULL argument.
 	* src/faillog.c: Use a %lu format and cast number of days to

Modified: upstream/trunk/src/groups.c
===================================================================
--- upstream/trunk/src/groups.c	2008-06-13 21:28:11 UTC (rev 2164)
+++ upstream/trunk/src/groups.c	2008-06-13 21:29:13 UTC (rev 2165)
@@ -106,9 +106,8 @@
  */
 int main (int argc, char **argv)
 {
-	long sys_ngroups;
-
 #ifdef HAVE_GETGROUPS
+	long sys_ngroups;
 	int ngroups;
 	GETGROUPS_T *groups;
 	int pri_grp; /* TODO: should be GETGROUPS_T */
@@ -118,9 +117,9 @@
 	char *getlogin ();
 #endif
 
-	sys_ngroups = sysconf (_SC_NGROUPS_MAX);
 #ifdef HAVE_GETGROUPS
-	groups = (GETGROUPS_T *) malloc (sys_ngroups * sizeof (GETGROUPS_T));
+	sys_ngroups = sysconf (_SC_NGROUPS_MAX);
+	groups = (GETGROUPS_T *) malloc (sizeof (GETGROUPS_T) * sys_ngroups);
 #endif
 	(void) setlocale (LC_ALL, "");
 	(void) bindtextdomain (PACKAGE, LOCALEDIR);