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

- (djm) [auth.c] Fixed test for locked account on HP/UX with shadowed 

passwords disabled. bz#1083 report & patch from senthilkumar_sen AT
   hotpop.com, w/ dtucker@
This commit is contained in:
Damien Miller 2008-07-05 08:59:43 +10:00
parent d8968adb5f
commit 22989f1b5e
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,8 @@
20080705
- (djm) [auth.c] Fixed test for locked account on HP/UX with shadowed
passwords disabled. bz#1083 report & patch from senthilkumar_sen AT
hotpop.com, w/ dtucker@
20080704 20080704
- (dtucker) OpenBSD CVS Sync - (dtucker) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2008/07/02 13:30:34 - djm@cvs.openbsd.org 2008/07/02 13:30:34
@ -4570,4 +4575,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@ passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.5058 2008/07/04 13:10:49 djm Exp $ $Id: ChangeLog,v 1.5059 2008/07/04 22:59:43 djm Exp $

3
auth.c
View File

@ -114,6 +114,7 @@ allowed_user(struct passwd * pw)
#endif /* USE_SHADOW */ #endif /* USE_SHADOW */
/* grab passwd field for locked account check */ /* grab passwd field for locked account check */
passwd = pw->pw_passwd;
#ifdef USE_SHADOW #ifdef USE_SHADOW
if (spw != NULL) if (spw != NULL)
#ifdef USE_LIBIAF #ifdef USE_LIBIAF
@ -121,8 +122,6 @@ allowed_user(struct passwd * pw)
#else #else
passwd = spw->sp_pwdp; passwd = spw->sp_pwdp;
#endif /* USE_LIBIAF */ #endif /* USE_LIBIAF */
#else
passwd = pw->pw_passwd;
#endif #endif
/* check for locked account */ /* check for locked account */