diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | auth-passwd.c | 8 |
2 files changed, 8 insertions, 5 deletions
@@ -1,3 +1,6 @@ | |||
1 | 20020506 | ||
2 | - (bal) Fixed auth-passwd.c to resolve PermitEmptyPassword issue | ||
3 | |||
1 | 20020501 | 4 | 20020501 |
2 | - (djm) Import OpenBSD regression tests. Requires BSD make to run | 5 | - (djm) Import OpenBSD regression tests. Requires BSD make to run |
3 | - (djm) Fix readpassphase compilation for systems which have it | 6 | - (djm) Fix readpassphase compilation for systems which have it |
@@ -525,4 +528,4 @@ | |||
525 | - (stevesk) entropy.c: typo in debug message | 528 | - (stevesk) entropy.c: typo in debug message |
526 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 529 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
527 | 530 | ||
528 | $Id: ChangeLog,v 1.2091 2002/05/01 12:00:22 djm Exp $ | 531 | $Id: ChangeLog,v 1.2092 2002/05/06 23:06:08 mouring Exp $ |
diff --git a/auth-passwd.c b/auth-passwd.c index 58c113649..896f1c263 100644 --- a/auth-passwd.c +++ b/auth-passwd.c | |||
@@ -36,7 +36,7 @@ | |||
36 | */ | 36 | */ |
37 | 37 | ||
38 | #include "includes.h" | 38 | #include "includes.h" |
39 | RCSID("$OpenBSD: auth-passwd.c,v 1.24 2002/03/04 12:43:06 markus Exp $"); | 39 | RCSID("$OpenBSD: auth-passwd.c,v 1.25 2002/05/06 23:00:59 mouring Exp $"); |
40 | 40 | ||
41 | #include "packet.h" | 41 | #include "packet.h" |
42 | #include "log.h" | 42 | #include "log.h" |
@@ -90,11 +90,11 @@ int | |||
90 | auth_password(Authctxt *authctxt, const char *password) | 90 | auth_password(Authctxt *authctxt, const char *password) |
91 | { | 91 | { |
92 | #if defined(USE_PAM) | 92 | #if defined(USE_PAM) |
93 | if (*password == '\0' && options.permit_empty_passwd == 0) | 93 | if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) |
94 | return 0; | 94 | return 0; |
95 | return auth_pam_password(authctxt, password); | 95 | return auth_pam_password(authctxt, password); |
96 | #elif defined(HAVE_OSF_SIA) | 96 | #elif defined(HAVE_OSF_SIA) |
97 | if (*password == '\0' && options.permit_empty_passwd == 0) | 97 | if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) |
98 | return 0; | 98 | return 0; |
99 | return auth_sia_password(authctxt, password); | 99 | return auth_sia_password(authctxt, password); |
100 | #else | 100 | #else |
@@ -131,7 +131,7 @@ auth_password(Authctxt *authctxt, const char *password) | |||
131 | */ | 131 | */ |
132 | if (!is_winnt) | 132 | if (!is_winnt) |
133 | #endif | 133 | #endif |
134 | if (*password == '\0' && options.permit_empty_passwd == 0) | 134 | if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) |
135 | return 0; | 135 | return 0; |
136 | #ifdef KRB5 | 136 | #ifdef KRB5 |
137 | if (options.kerberos_authentication == 1) { | 137 | if (options.kerberos_authentication == 1) { |