Re-import of OpenSSH 3.7.1p2 (Chase\!)

[gssapi-openssh.git] / openssh / auth2-passwd.c

diff --git a/openssh/auth2-passwd.c b/openssh/auth2-passwd.c
index ffa27959426a6c8f431dbc7bbbb35316b343e8d1..67fb4c9216be4445e0e4200d58b6062342bc6f2b 100644 (file)
--- a/openssh/auth2-passwd.c
+++ b/openssh/auth2-passwd.c
@@ -23,7 +23,7 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-passwd.c,v 1.2 2002/05/31 11:35:15 markus Exp $");
+RCSID("$OpenBSD: auth2-passwd.c,v 1.4 2003/08/26 09:58:43 markus Exp $");
 
 #include "xmalloc.h"
 #include "packet.h"
@@ -44,14 +44,14 @@ userauth_passwd(Authctxt *authctxt)
        u_int len;
        change = packet_get_char();
        if (change)
-               log("password change not supported");
+               logit("password change not supported");
        password = packet_get_string(&len);
        packet_check_eom();
-       if (authctxt->valid &&
+       if (PRIVSEP(auth_password(authctxt, password)) == 1
 #ifdef HAVE_CYGWIN
-           check_nt_auth(1, authctxt->pw) &&
+           && check_nt_auth(1, authctxt->pw)
 #endif
-           PRIVSEP(auth_password(authctxt, password)) == 1)
+           )
                authenticated = 1;
        memset(password, 0, len);
        xfree(password);