* New upstream release.

* Update to GSSAPI patch from
  http://www.sxw.org.uk/computing/patches/openssh-5.3p1-gsskex-all-20100124.patch.

1 files changed, 1 insertions, 9 deletions

diff --git a/auth1.c b/auth1.c
index 8ff98d493..184ee0545 100644
--- a/auth1.c
+++ b/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)) {