diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | auth-passwd.c | 10 |
2 files changed, 8 insertions, 6 deletions
@@ -4,6 +4,8 @@ | |||
4 | Pekka Savola <pekkas@netcore.fi> | 4 | Pekka Savola <pekkas@netcore.fi> |
5 | - (djm) Try to drop supplemental groups at daemon startup. Patch from | 5 | - (djm) Try to drop supplemental groups at daemon startup. Patch from |
6 | RedHat | 6 | RedHat |
7 | - (bal) Back all the way out of auth-passwd.c changes. Breaks too many | ||
8 | things that don't set pw->pw_passwd. | ||
7 | 9 | ||
8 | 20020509 | 10 | 20020509 |
9 | - (tim) [Makefile.in] Unbreak make -f Makefile.in distprep | 11 | - (tim) [Makefile.in] Unbreak make -f Makefile.in distprep |
@@ -555,4 +557,4 @@ | |||
555 | - (stevesk) entropy.c: typo in debug message | 557 | - (stevesk) entropy.c: typo in debug message |
556 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ | 558 | - (djm) ssh-keygen -i needs seeded RNG; report from markus@ |
557 | 559 | ||
558 | $Id: ChangeLog,v 1.2102 2002/05/10 02:20:24 djm Exp $ | 560 | $Id: ChangeLog,v 1.2103 2002/05/10 02:40:15 mouring Exp $ |
diff --git a/auth-passwd.c b/auth-passwd.c index 348ab9ddb..58c113649 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.25 2002/05/06 23:00:59 mouring Exp $"); | 39 | RCSID("$OpenBSD: auth-passwd.c,v 1.24 2002/03/04 12:43:06 markus Exp $"); |
40 | 40 | ||
41 | #include "packet.h" | 41 | #include "packet.h" |
42 | #include "log.h" | 42 | #include "log.h" |
@@ -89,16 +89,16 @@ extern ServerOptions options; | |||
89 | int | 89 | int |
90 | auth_password(Authctxt *authctxt, const char *password) | 90 | auth_password(Authctxt *authctxt, const char *password) |
91 | { | 91 | { |
92 | struct passwd * pw = authctxt->pw; | ||
93 | #if defined(USE_PAM) | 92 | #if defined(USE_PAM) |
94 | if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) | 93 | if (*password == '\0' && options.permit_empty_passwd == 0) |
95 | return 0; | 94 | return 0; |
96 | return auth_pam_password(authctxt, password); | 95 | return auth_pam_password(authctxt, password); |
97 | #elif defined(HAVE_OSF_SIA) | 96 | #elif defined(HAVE_OSF_SIA) |
98 | if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) | 97 | if (*password == '\0' && options.permit_empty_passwd == 0) |
99 | return 0; | 98 | return 0; |
100 | return auth_sia_password(authctxt, password); | 99 | return auth_sia_password(authctxt, password); |
101 | #else | 100 | #else |
101 | struct passwd * pw = authctxt->pw; | ||
102 | char *encrypted_password; | 102 | char *encrypted_password; |
103 | char *pw_password; | 103 | char *pw_password; |
104 | char *salt; | 104 | char *salt; |
@@ -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 (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) | 134 | if (*password == '\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) { |