merged OpenSSH 5.3p1 to trunk

[gssapi-openssh.git] / openssh / auth2-none.c

diff --git a/openssh/auth2-none.c b/openssh/auth2-none.c
index 10accfe552dfb0657c5eeca5676d18097e0c07af..08f2f935fe9840dd9cd9d3bd468ecdc2e1e11435 100644 (file)
--- a/openssh/auth2-none.c
+++ b/openssh/auth2-none.c
@@ -61,10 +61,6 @@ userauth_none(Authctxt *authctxt)
 {
        none_enabled = 0;
        packet_check_eom();
-#ifdef HAVE_CYGWIN
-       if (check_nt_auth(1, authctxt->pw) == 0)
-               return (0);
-#endif
        if (options.password_authentication)
                return (PRIVSEP(auth_password(authctxt, "")));
        return (0);