- (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

1 files changed, 4 insertions, 4 deletions

diff --git a/auth2-passwd.c b/auth2-passwd.c
index a8f15161a..5026969f8 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -44,14 +44,14 @@ userauth_passwd(Authctxt *authctxt)
         u_int len;
         change = packet_get_char();
         if (change)
-                logit("password change not supported");
+                log("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);