2 files changed, 5 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index b0e744b60..93e1f79c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 20020506
+ - (djm) Unbreak auth-passwd.c for PAM and SIA
+
+20020506
  - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue
  
 20020501
@@ -528,4 +531,4 @@
  - (stevesk) entropy.c: typo in debug message
  - (djm) ssh-keygen -i needs seeded RNG; report from markus@
 
-$Id: ChangeLog,v 1.2092 2002/05/06 23:06:08 mouring Exp $
+$Id: ChangeLog,v 1.2093 2002/05/08 02:18:26 djm Exp $
diff --git a/auth-passwd.c b/auth-passwd.c
index 896f1c263..348ab9ddb 100644
--- a/auth-passwd.c
+++ b/auth-passwd.c
@@ -89,6 +89,7 @@ extern ServerOptions options;
 int
 auth_password(Authctxt *authctxt, const char *password)
 {
+        struct passwd * pw = authctxt->pw;
 #if defined(USE_PAM)
         if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0)
                 return 0;
@@ -98,7 +99,6 @@ auth_password(Authctxt *authctxt, const char *password)
                 return 0;
         return auth_sia_password(authctxt, password);
 #else
-        struct passwd * pw = authctxt->pw;
         char *encrypted_password;
         char *pw_password;
         char *salt;