Merge 4.0p1 to the trunk.

1 files changed, 4 insertions, 4 deletions

diff --git a/auth2-passwd.c b/auth2-passwd.c
index a4f482d2e..2321ef47b 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -55,12 +55,12 @@ userauth_passwd(Authctxt *authctxt)
 
         if (change)
                 logit("password change not supported");
-        else if (PRIVSEP(auth_password(authctxt, password)) == 1
+        else if (PRIVSEP(auth_password(authctxt, password)) == 1)
+                authenticated = 1;
 #ifdef HAVE_CYGWIN
-            && check_nt_auth(1, authctxt->pw)
+        if (check_nt_auth(1, authctxt->pw) == 0)
+                authenticated = 0;
 #endif
-            )
-                authenticated = 1;
         memset(password, 0, len);
         xfree(password);
         return authenticated;