tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Tweak password expiry checking at suggestion of Kevin Steves 

<stevesk@sweden.hp.com>
This commit is contained in:
Damien Miller 2000-09-23 14:26:32 +11:00
parent 578783e6bf
commit 62dd94b375
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -3,6 +3,8 @@
<stevesk@sweden.hp.com> <stevesk@sweden.hp.com>
- (djm) Redhat spec and manpage fixes from Pekka Savola <pekkas@netcore.fi> - (djm) Redhat spec and manpage fixes from Pekka Savola <pekkas@netcore.fi>
- (djm) Seperate tests for int64_t and u_int64_t types - (djm) Seperate tests for int64_t and u_int64_t types
- (djm) Tweak password expiry checking at suggestion of Kevin Steves
<stevesk@sweden.hp.com>
20000920 20000920
- (djm) Fix bad path substitution. Report from Andrew Miner - (djm) Fix bad path substitution. Report from Andrew Miner

8
auth.c
View File

@ -81,8 +81,8 @@ allowed_user(struct passwd * pw)
#ifdef WITH_AIXAUTHENTICATE #ifdef WITH_AIXAUTHENTICATE
char *loginmsg; char *loginmsg;
#endif /* WITH_AIXAUTHENTICATE */ #endif /* WITH_AIXAUTHENTICATE */
#if defined(HAVE_SHADOW_H) && !defined(DISABLE_SHADOW) && \ #if !defined(PAM) && defined(HAVE_SHADOW_H) && \
defined(HAS_SHADOW_EXPIRE) !defined(DISABLE_SHADOW) && defined(HAS_SHADOW_EXPIRE)
struct spwd *spw; struct spwd *spw;
/* 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... */
@ -94,11 +94,11 @@ allowed_user(struct passwd * pw)
int days = time(NULL) / 86400; int days = time(NULL) / 86400;
/* Check account expiry */ /* Check account expiry */
if ((spw->sp_expire > 0) && (days > spw->sp_expire)) if ((spw->sp_expire >= 0) && (days > spw->sp_expire))
return 0; return 0;
/* Check password expiry */ /* Check password expiry */
if ((spw->sp_lstchg > 0) && (spw->sp_max > 0) && if ((spw->sp_lstchg >= 0) && (spw->sp_max >= 0) &&
(days > (spw->sp_lstchg + spw->sp_max))) (days > (spw->sp_lstchg + spw->sp_max)))
return 0; return 0;
} }