summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2002-05-08 12:18:26 +1000
committerDamien Miller <djm@mindrot.org>2002-05-08 12:18:26 +1000
commit52910ddc664ec7ae8148cff1b796d9b27ac6924f (patch)
treeb0e395633a29bc1d366e845c13c75b32c294292f
parent532bbdb99b23e8ff05faff3eeee7345dae2a541b (diff)
- (djm) Unbreak auth-passwd.c for PAM and SIA
-rw-r--r--ChangeLog5
-rw-r--r--auth-passwd.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index b0e744b6..93e1f79c 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 896f1c26..348ab9dd 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;