merged OpenSSH 5.3p1 to trunk

[gssapi-openssh.git] / openssh / auth1.c

diff --git a/openssh/auth1.c b/openssh/auth1.c
index b8a25587232781b79eba9e024388c3bafe5ac879..1801661fdda8b72236de420f22eb8cd957a4314a 100644 (file)
--- a/openssh/auth1.c
+++ b/openssh/auth1.c
@@ -318,15 +318,7 @@ do_authloop(Authctxt *authctxt)
                }
 #endif /* _UNICOS */
 
-#ifdef HAVE_CYGWIN
-               if (authenticated &&
-                   !check_nt_auth(type == SSH_CMSG_AUTH_PASSWORD,
-                   authctxt->pw)) {
-                       packet_disconnect("Authentication rejected for uid %d.",
-                           authctxt->pw == NULL ? -1 : authctxt->pw->pw_uid);
-                       authenticated = 0;
-               }
-#else
+#ifndef HAVE_CYGWIN
                /* Special handling for root */
                if (authenticated && authctxt->pw->pw_uid == 0 &&
                    !auth_root_allowed(meth->name)) {