From 458c6bfa10bb370487e9e27f540e1a7e7a5909cc Mon Sep 17 00:00:00 2001 From: Tim Rice Date: Wed, 8 Jan 2003 20:04:27 -0800 Subject: [PATCH] [auth.c] declare today at top of allowed_user() to keep older compilers happy. --- ChangeLog | 5 +++-- auth.c | 5 ++++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index af4ec49e9..db9c94f14 100644 --- a/ChangeLog +++ b/ChangeLog @@ -16,7 +16,8 @@ - (djm) Update README to reflect AIX's status as a well supported platform. From dtucker@zip.com.au - (tim) [Makefile.in configure.ac] replace fixpath with sed script. Patch - by Mo DeJong. + - (tim) [auth.c] declare today at top of allowed_user() to keep + older compilers happy. 20030107 - (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses. @@ -962,4 +963,4 @@ save auth method before monitor_reset_key_state(); bugzilla bug #284; ok provos@ -$Id: ChangeLog,v 1.2555 2003/01/09 01:22:59 tim Exp $ +$Id: ChangeLog,v 1.2556 2003/01/09 04:04:27 tim Exp $ diff --git a/auth.c b/auth.c index 48586cc5d..c6e5a1732 100644 --- a/auth.c +++ b/auth.c @@ -80,6 +80,9 @@ allowed_user(struct passwd * pw) #endif /* WITH_AIXAUTHENTICATE */ #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) struct spwd *spw; +#if !defined(USE_PAM) && defined(HAS_SHADOW_EXPIRE) + time_t today; +#endif #endif /* Shouldn't be called if pw is NULL, but better safe than sorry... */ @@ -106,7 +109,7 @@ allowed_user(struct passwd * pw) #if !defined(USE_PAM) && defined(HAVE_SHADOW_H) && \ !defined(DISABLE_SHADOW) && defined(HAS_SHADOW_EXPIRE) #define DAY (24L * 60 * 60) /* 1 day in seconds */ - time_t today = time(NULL) / DAY; + today = time(NULL) / DAY; debug3("allowed_user: today %d sp_expire %d sp_lstchg %d" " sp_max %d", (int)today, (int)spw->sp_expire, (int)spw->sp_lstchg, (int)spw->sp_max);