summaryrefslogtreecommitdiff
path: root/auth2-passwd.c
diff options
context:
space:
mode:
authorDamien Miller <djm@mindrot.org>2003-04-29 23:22:40 +1000
committerDamien Miller <djm@mindrot.org>2003-04-29 23:22:40 +1000
commiteab4bae03894f07ea556db4d781795c724245af7 (patch)
tree30289e5ea867bf4e9246b6a5bfe2f31f664dedc3 /auth2-passwd.c
parent0e7f4363f3d7b2ae707709607fd816f663c7449a (diff)
- (djm) Add back radix.o (used by AFS support), after it went missing from
Makefile many moons ago - (djm) Apply "owl-always-auth" patch from Openwall/Solar Designer - (djm) Fix blibpath specification for AIX/gcc - (djm) Some systems have basename in -lgen. Fix from ayamura@ayamura.org
Diffstat (limited to 'auth2-passwd.c')
-rw-r--r--auth2-passwd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/auth2-passwd.c b/auth2-passwd.c
index a8f15161..3c2734b5 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -47,11 +47,11 @@ userauth_passwd(Authctxt *authctxt)
logit("password change not supported");
password = packet_get_string(&len);
packet_check_eom();
- if (authctxt->valid &&
+ if (PRIVSEP(auth_password(authctxt, password)) == 1 && authctxt->valid
#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);