- (bal) Back all the way out of auth-passwd.c changes. Breaks too many

   things that don't set pw->pw_passwd.

diff --git a/ChangeLog b/ChangeLog
index 060b72e2a1740e2c8da1cbe9c6c23694e5aec5cb..3635ebbd01254a3377cf973d68309f3721fb3ac8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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

diff --git a/auth-passwd.c b/auth-passwd.c
index 348ab9ddbe23b06fbd7aa209e4ab1b82b28804f6..58c11364974e1052435fe2bc7aa3866d62aad9e0 100644 (file)
--- 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) {