diff options
| author | mouring <mouring> | 2002-05-10 02:40:15 +0000 |
|---|---|---|
| committer | mouring <mouring> | 2002-05-10 02:40:15 +0000 |
| commit | 9e5b1381f9357439fc61c7eec4bf7f847f38e28d (patch) | |
| tree | 5d9c91b01e046dd12c10e0258a3e10555671cf18 /auth-passwd.c | |
| parent | 5712abd3068f86d8ddec85f32da614b59bdbff21 (diff) | |
| download | openssh-9e5b1381f9357439fc61c7eec4bf7f847f38e28d.tar.gz | |
- (bal) Back all the way out of auth-passwd.c changes. Breaks too many
things that don't set pw->pw_passwd.
Diffstat (limited to 'auth-passwd.c')
| -rw-r--r-- | auth-passwd.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/auth-passwd.c b/auth-passwd.c index 348ab9dd..58c11364 100644 --- a/auth-passwd.c +++ b/auth-passwd.c @@ -36,7 +36,7 @@ */ #include "includes.h" -RCSID("$OpenBSD: auth-passwd.c,v 1.25 2002/05/06 23:00:59 mouring Exp $"); +RCSID("$OpenBSD: auth-passwd.c,v 1.24 2002/03/04 12:43:06 markus Exp $"); #include "packet.h" #include "log.h" @@ -89,16 +89,16 @@ 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) + if (*password == '\0' && options.permit_empty_passwd == 0) return 0; return auth_pam_password(authctxt, password); #elif defined(HAVE_OSF_SIA) - if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) + if (*password == '\0' && options.permit_empty_passwd == 0) return 0; return auth_sia_password(authctxt, password); #else + struct passwd * pw = authctxt->pw; char *encrypted_password; char *pw_password; char *salt; @@ -131,7 +131,7 @@ auth_password(Authctxt *authctxt, const char *password) */ if (!is_winnt) #endif - if (*pw->pw_passwd == '\0' && options.permit_empty_passwd == 0) + if (*password == '\0' && options.permit_empty_passwd == 0) return 0; #ifdef KRB5 if (options.kerberos_authentication == 1) { |