* src/passwd.c: do_update_age is only used ifndef USE_PAM. Make it

more explicit.
This commit is contained in:
nekral-guest 2009-04-05 22:04:31 +00:00
parent a1cac18ac3
commit 021066a980
2 changed files with 9 additions and 0 deletions

View File

@ -1,3 +1,8 @@
2009-04-05 Nicolas François <nicolas.francois@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@centraliens.net> 2009-04-05 Nicolas François <nicolas.francois@centraliens.net>
* src/useradd.c: Set errno to 0 before calling strtol. * src/useradd.c: Set errno to 0 before calling strtol.

View File

@ -99,7 +99,9 @@ static long age_max = 0; /* Maximum days until change */
static long warn = 0; /* Warning days before change */ static long warn = 0; /* Warning days before change */
static long inact = 0; /* Days without change before locked */ static long inact = 0; /* Days without change before locked */
#ifndef USE_PAM
static bool do_update_age = false; static bool do_update_age = false;
#endif
static bool pw_locked = false; static bool pw_locked = false;
static bool spw_locked = false; static bool spw_locked = false;
@ -634,6 +636,7 @@ static void update_shadow (void)
if (iflg) { if (iflg) {
nsp->sp_inact = (inact * DAY) / SCALE; nsp->sp_inact = (inact * DAY) / SCALE;
} }
#ifndef USE_PAM
if (do_update_age) { if (do_update_age) {
nsp->sp_lstchg = (long) time ((time_t *) 0) / SCALE; nsp->sp_lstchg = (long) time ((time_t *) 0) / SCALE;
if (0 == nsp->sp_lstchg) { if (0 == nsp->sp_lstchg) {
@ -642,6 +645,7 @@ static void update_shadow (void)
nsp->sp_lstchg = -1; nsp->sp_lstchg = -1;
} }
} }
#endif
/* /*
* Force change on next login, like SunOS 4.x passwd -e or Solaris * Force change on next login, like SunOS 4.x passwd -e or Solaris