- (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@

diff --git a/ChangeLog b/ChangeLog
index 4ba39aa362364df7ab4a5ada49435e83ac3c00d1..d57808f3c45725a97ee48989370b8ce8de55a725 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
  - (dtucker) OpenBSD CVS Sync
    - djm@cvs.openbsd.org 2008/07/02 13:30:34

diff --git a/auth.c b/auth.c
index c2d298f1bf46dcca6afb44c88d69cb3684ccf285..84aa2c5e8b1e562734aace254d34c6f43d3fe8c4 100644 (file)
--- a/auth.c
+++ b/auth.c
@@ -114,6 +114,7 @@ allowed_user(struct passwd * pw)
 #endif /* USE_SHADOW */
 
        /* grab passwd field for locked account check */
+       passwd = pw->pw_passwd;
 #ifdef USE_SHADOW
        if (spw != NULL)
 #ifdef USE_LIBIAF
@@ -121,8 +122,6 @@ allowed_user(struct passwd * pw)
 #else
                passwd = spw->sp_pwdp;
 #endif /* USE_LIBIAF */
-#else
-       passwd = pw->pw_passwd;
 #endif
 
        /* check for locked account */