[auth.c] declare today at top of allowed_user() to keep older compilers happy.

This commit is contained in:
Tim Rice 2003-01-08 20:04:27 -08:00
Родитель d0d7a8b27b
Коммит 458c6bfa10
2 изменённых файлов: 7 добавлений и 3 удалений

Просмотреть файл

@ -16,7 +16,8 @@
- (djm) Update README to reflect AIX's status as a well supported platform. - (djm) Update README to reflect AIX's status as a well supported platform.
From dtucker@zip.com.au From dtucker@zip.com.au
- (tim) [Makefile.in configure.ac] replace fixpath with sed script. Patch - (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 20030107
- (djm) Bug #401: Work around Linux breakage with IPv6 mapped addresses. - (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; save auth method before monitor_reset_key_state(); bugzilla bug #284;
ok provos@ 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 $

5
auth.c
Просмотреть файл

@ -80,6 +80,9 @@ allowed_user(struct passwd * pw)
#endif /* WITH_AIXAUTHENTICATE */ #endif /* WITH_AIXAUTHENTICATE */
#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) #if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW)
struct spwd *spw; struct spwd *spw;
#if !defined(USE_PAM) && defined(HAS_SHADOW_EXPIRE)
time_t today;
#endif
#endif #endif
/* Shouldn't be called if pw is NULL, but better safe than sorry... */ /* 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) && \ #if !defined(USE_PAM) && defined(HAVE_SHADOW_H) && \
!defined(DISABLE_SHADOW) && defined(HAS_SHADOW_EXPIRE) !defined(DISABLE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
#define DAY (24L * 60 * 60) /* 1 day in seconds */ #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" debug3("allowed_user: today %d sp_expire %d sp_lstchg %d"
" sp_max %d", (int)today, (int)spw->sp_expire, " sp_max %d", (int)today, (int)spw->sp_expire,
(int)spw->sp_lstchg, (int)spw->sp_max); (int)spw->sp_lstchg, (int)spw->sp_max);