RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- (djm) Stop shadow expiry checking from preventing logins with NIS. Based 

on fix from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
This commit is contained in:
Damien Miller 2000-07-02 18:44:54 +10:00
parent 9b6d4ab8f9
commit c708843e6a
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
20000702
- (djm) Fix brace mismatch from Corinna Vinschen <vinschen@cygnus.com>
- (djm) Stop shadow expiry checking from preventing logins with NIS. Based
on fix from HARUYAMA Seigo <haruyama@nt.phys.s.u-tokyo.ac.jp>
20000701
- (djm) Fix Tru64 SIA problems reported by John P Speno <speno@isc.upenn.edu>

21
auth.c
View File

@ -65,17 +65,18 @@ allowed_user(struct passwd * pw)
return 0;
spw = getspnam(pw->pw_name);
if (spw == NULL)
return 0;
/* Check account expiry */
if ((spw->sp_expire > 0) && ((time(NULL) / 86400) > spw->sp_expire))
return 0;
if (spw != NULL) {
int days = time(NULL) / 86400;
/* Check password expiry */
if ((spw->sp_lstchg > 0) && (spw->sp_inact > 0) &&
((time(NULL) / 86400) > (spw->sp_lstchg + spw->sp_inact)))
return 0;
/* Check account expiry */
if ((spw->sp_expire > 0) && (days > spw->sp_expire))
return 0;
/* Check password expiry */
if ((spw->sp_lstchg > 0) && (spw->sp_inact > 0) &&
(days > (spw->sp_lstchg + spw->sp_inact)))
return 0;
}
#else
/* Shouldn't be called if pw is NULL, but better safe than sorry... */
if (!pw)