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

[nekral-guest at alioth.debian.org]

Author: nekral-guest
Date: 2008-06-13 21:09:14 +0000 (Fri, 13 Jun 2008)
New Revision: 2159

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/passwd.c
Log:
	* src/passwd.c: Ignore return value of time() when use with a
	non NULL argument.
	* src/passwd.c: Cast number of days to a long integer.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2008-06-13 21:08:06 UTC (rev 2158)
+++ upstream/trunk/ChangeLog	2008-06-13 21:09:14 UTC (rev 2159)
@@ -1,5 +1,11 @@
 2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/passwd.c: Ignore return value of time() when use with a
+	non NULL argument.
+	* src/passwd.c: Cast number of days to a long integer.
+
+2008-06-13  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/groupmod.c: The ID argument of audit_logger is an unsigned
 	int. Use AUDIT_NO_ID instead of -1.
 	* src/groupmod.c:  Use a %lu format and cast group and user IDs to

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2008-06-13 21:08:06 UTC (rev 2158)
+++ upstream/trunk/src/passwd.c	2008-06-13 21:09:14 UTC (rev 2159)
@@ -365,7 +365,7 @@
 		return;
 	}
 
-	time (&now);
+	(void) time (&now);
 
 	/*
 	 * Expired accounts cannot be changed ever. Passwords which are
@@ -588,7 +588,7 @@
 		nsp->sp_inact = (inact * DAY) / SCALE;
 	}
 	if (do_update_age) {
-		nsp->sp_lstchg = time ((time_t *) 0) / SCALE;
+		nsp->sp_lstchg = (long) time ((time_t *) 0) / SCALE;
 	}
 	if (lflg) {
 		/* Set the account expiry field to 1.