diff options
| author | Ben Lindstrom <mouring@eviladmin.org> | 2002-05-10 02:40:15 +0000 |
|---|---|---|
| committer | Ben Lindstrom <mouring@eviladmin.org> | 2002-05-10 02:40:15 +0000 |
| commit | 0b47814b43460fc94668f69b7cd24081e0190fc9 (patch) | |
| tree | 04a1b0e9023dbe24ea167771128bb3fe1da818ac | |
| parent | 87aea25f1ac7caf3a788f17c62164c0103ec3d35 (diff) | |
- (bal) Back all the way out of auth-passwd.c changes. Breaks too many
things that don't set pw->pw_passwd.
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | auth-passwd.c | 10 |
2 files changed, 8 insertions, 6 deletions
@@ -4,6 +4,8 @@ Pekka Savola <pekkas@netcore.fi> - (djm) Try to drop supplemental groups at daemon startup. Patch from RedHat + - (bal) Back all the way out of auth-passwd.c changes. Breaks too many + things that don't set pw->pw_passwd. 20020509 - (tim) [Makefile.in] Unbreak make -f Makefile.in distprep @@ -555,4 +557,4 @@ - (stevesk) entropy.c: typo in debug message - (djm) ssh-keygen -i needs seeded RNG; report from markus@ -$Id: ChangeLog,v 1.2102 2002/05/10 02:20:24 djm Exp $ +$Id: ChangeLog,v 1.2103 2002/05/10 02:40:15 mouring Exp $ 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) { |