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

[Nicolas FRANÇOIS]

Author: nekral-guest
Date: 2011-07-14 14:03:19 +0000 (Thu, 14 Jul 2011)
New Revision: 3397

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/passwd.c
Log:
	* src/passwd.c: Overflow when computing the number of days based
	on the scaling. Use of long long needed.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2011-07-14 13:58:17 UTC (rev 3396)
+++ upstream/trunk/ChangeLog	2011-07-14 14:03:19 UTC (rev 3397)
@@ -1,5 +1,10 @@
 2011-07-14  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/passwd.c: Overflow when computing the number of days based
+	on the scaling. Use of long long needed.
+
+2011-07-14  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* NEWS, lib/commonio.h, lib/commonio.c: Additional messages to
 	indicate why locking failed.
 	* NEWS, lib/commonio.c: Fix the sort algorithm in case of NIS. NIS

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2011-07-14 13:58:17 UTC (rev 3396)
+++ upstream/trunk/src/passwd.c	2011-07-14 14:03:19 UTC (rev 3397)
@@ -458,14 +458,14 @@
 
 	sp = getspnam (pw->pw_name); /* local, no need for xgetspnam */
 	if (NULL != sp) {
-		(void) printf ("%s %s %s %ld %ld %ld %ld\n",
+		(void) printf ("%s %s %s %lld %lld %lld %lld\n",
 		               pw->pw_name,
 		               pw_status (sp->sp_pwdp),
 		               date_to_str (sp->sp_lstchg * SCALE),
-		               (sp->sp_min * SCALE) / DAY,
-		               (sp->sp_max * SCALE) / DAY,
-		               (sp->sp_warn * SCALE) / DAY,
-		               (sp->sp_inact * SCALE) / DAY);
+		               ((long long)sp->sp_min * SCALE) / DAY,
+		               ((long long)sp->sp_max * SCALE) / DAY,
+		               ((long long)sp->sp_warn * SCALE) / DAY,
+		               ((long long)sp->sp_inact * SCALE) / DAY);
 	} else {
 		(void) printf ("%s %s\n",
 		               pw->pw_name, pw_status (pw->pw_passwd));