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

[Nicolas FRANCOIS]

Author: nekral-guest
Date: 2009-04-05 22:04:31 +0000 (Sun, 05 Apr 2009)
New Revision: 2594

Modified:
   upstream/trunk/ChangeLog
   upstream/trunk/src/passwd.c
Log:
	* src/passwd.c: do_update_age is only used ifndef USE_PAM. Make it
	more explicit.


Modified: upstream/trunk/ChangeLog
===================================================================
--- upstream/trunk/ChangeLog	2009-04-05 22:02:50 UTC (rev 2593)
+++ upstream/trunk/ChangeLog	2009-04-05 22:04:31 UTC (rev 2594)
@@ -1,5 +1,10 @@
 2009-04-05  Nicolas François  <nicolas.francois at centraliens.net>
 
+	* src/passwd.c: do_update_age is only used ifndef USE_PAM. Make it
+	more explicit.
+
+2009-04-05  Nicolas François  <nicolas.francois at centraliens.net>
+
 	* src/useradd.c: Set errno to 0 before calling strtol.
 
 2009-04-05  Nicolas François  <nicolas.francois at centraliens.net>

Modified: upstream/trunk/src/passwd.c
===================================================================
--- upstream/trunk/src/passwd.c	2009-04-05 22:02:50 UTC (rev 2593)
+++ upstream/trunk/src/passwd.c	2009-04-05 22:04:31 UTC (rev 2594)
@@ -99,7 +99,9 @@
 static long warn = 0;		/* Warning days before change   */
 static long inact = 0;		/* Days without change before locked */
 
+#ifndef USE_PAM
 static bool do_update_age = false;
+#endif
 
 static bool pw_locked = false;
 static bool spw_locked = false;
@@ -634,6 +636,7 @@
 	if (iflg) {
 		nsp->sp_inact = (inact * DAY) / SCALE;
 	}
+#ifndef USE_PAM
 	if (do_update_age) {
 		nsp->sp_lstchg = (long) time ((time_t *) 0) / SCALE;
 		if (0 == nsp->sp_lstchg) {
@@ -642,6 +645,7 @@
 			nsp->sp_lstchg = -1;
 		}
 	}
+#endif
 
 	/*
 	 * Force change on next login, like SunOS 4.x passwd -e or Solaris