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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-06-13 21:31:23 +0000 (Fri, 13 Jun 2008)
New Revision: 2167

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/id.c
Log:
	* src/id.c: Make sure malloc receives a size_t.
	* src/id.c: Use a %lu format and cast group and user IDs to
	unsigned long integers.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-06-13 21:30:09 UTC (rev 2166)
+++ upstream/trunk/ChangeLog	2008-06-13 21:31:23 UTC (rev 2167)
@@ -1,5 +1,11 @@
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/id.c: Make sure malloc receives a size_t.
+	* src/id.c: Use a %lu format and cast group and user IDs to
+	unsigned long integers.
+
+2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/sulogin.c: Ignore the return value of signal().
 
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/id.c
===================================================================
--- upstream/trunk/src/id.c	2008-06-13 21:30:09 UTC (rev 2166)
+++ upstream/trunk/src/id.c	2008-06-13 21:31:23 UTC (rev 2167)
@@ -94,7 +94,7 @@
 	 */
 	sys_ngroups = sysconf (_SC_NGROUPS_MAX);
 #ifdef HAVE_GETGROUPS
-	groups = (GETGROUPS_T *) malloc (sys_ngroups * sizeof (GETGROUPS_T));
+	groups = (GETGROUPS_T *) malloc (sizeof (GETGROUPS_T) * sys_ngroups);
 	/*
 	 * See if the -a flag has been given to print out the concurrent
 	 * group set.
@@ -125,16 +125,18 @@
 
 	pw = getpwuid (ruid); /* local, no need for xgetpwuid */
 	if (NULL != pw) {
-		(void) printf ("UID=%u(%s)", ruid, pw->pw_name);
+		(void) printf ("UID=%lu(%s)",
+		               (unsigned long) ruid, pw->pw_name);
 	} else {
-		(void) printf ("UID=%u", ruid);
+		(void) printf ("UID=%lu", (unsigned long) ruid);
 	}
 
 	gr = getgrgid (rgid);; /* local, no need for xgetgrgid */
 	if (NULL != gr) {
-		(void) printf (" GID=%u(%s)", rgid, gr->gr_name);
+		(void) printf (" GID=%lu(%s)",
+		               (unsigned long) rgid, gr->gr_name);
 	} else {
-		(void) printf (" GID=%u", rgid);
+		(void) printf (" GID=%lu", (unsigned long) rgid);
 	}
 
 	/*
@@ -145,17 +147,19 @@
 	if (ruid != euid) {
 		pw = getpwuid (euid); /* local, no need for xgetpwuid */
 		if (NULL != pw) {
-			(void) printf (" EUID=%u(%s)", euid, pw->pw_name);
+			(void) printf (" EUID=%lu(%s)",
+			               (unsigned long) euid, pw->pw_name);
 		} else {
-			(void) printf (" EUID=%u", euid);
+			(void) printf (" EUID=%lu", (unsigned long) euid);
 		}
 	}
 	if (rgid != egid) {
 		gr = getgrgid (egid); /* local, no need for xgetgrgid */
 		if (NULL != gr) {
-			(void) printf (" EGID=%u(%s)", egid, gr->gr_name);
+			(void) printf (" EGID=%lu(%s)",
+			               (unsigned long) egid, gr->gr_name);
 		} else {
-			(void) printf (" EGID=%u", egid);
+			(void) printf (" EGID=%lu", (unsigned long) egid);
 		}
 	}
 #ifdef HAVE_GETGROUPS
@@ -181,10 +185,12 @@
 			/* local, no need for xgetgrgid */
 			gr = getgrgid (groups[i]);
 			if (NULL != gr) {
-				(void) printf ("%u(%s)",
-				               groups[i], gr->gr_name);
+				(void) printf ("%lu(%s)",
+				               (unsigned long) groups[i],
+				               gr->gr_name);
 			} else {
-				(void) printf ("%u", groups[i]);
+				(void) printf ("%lu",
+				               (unsigned long) groups[i]);
 			}
 		}
 	}