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

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
@@ -4570,4 +4575,4 @@
    OpenServer 6 and add osr5bigcrypt support so when someone migrates
    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 $

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 */