From b5d16e713867abc03742aca168b7a54a25c4790b Mon Sep 17 00:00:00 2001 From: des Date: Wed, 7 Jan 2004 11:10:17 +0000 Subject: Vendor import of OpenSSH 3.7.1p2. --- crypto/openssh/auth2-passwd.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'crypto/openssh/auth2-passwd.c') diff --git a/crypto/openssh/auth2-passwd.c b/crypto/openssh/auth2-passwd.c index ffa2795..67fb4c9 100644 --- a/crypto/openssh/auth2-passwd.c +++ b/crypto/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); -- cgit v1.1