- (djm) Unbreak auth-passwd.c for PAM and SIA

diff --git a/ChangeLog b/ChangeLog
index 4eb5b2b31570f41b986a8658bb372fabeff24f6e..45595eed6121c24c57ed0cc1fc22e180ad43c371 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+20020506
+ - (djm) Unbreak auth-passwd.c for PAM and SIA
+
 20020506
  - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue
  

diff --git a/auth-passwd.c b/auth-passwd.c
index 896f1c26364ae5c17fb4d28a96caaebe9112c52e..348ab9ddbe23b06fbd7aa209e4ab1b82b28804f6 100644 (file)
--- 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;