merged OpenSSH 5.3p1 to trunk

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

diff --git a/openssh/auth2-passwd.c b/openssh/auth2-passwd.c
index 2321ef47be38145250fc16b51354d3d7d2a44cd5..5f1f3635f7a076a98084843e8b097380b79df765 100644 (file)
--- a/openssh/auth2-passwd.c
+++ b/openssh/auth2-passwd.c
@@ -1,3 +1,4 @@
+/* $OpenBSD: auth2-passwd.c,v 1.9 2006/08/03 03:34:41 deraadt Exp $ */
 /*
  * Copyright (c) 2000 Markus Friedl.  All rights reserved.
  *
@@ -23,12 +24,22 @@
  */
 
 #include "includes.h"
-RCSID("$OpenBSD: auth2-passwd.c,v 1.5 2003/12/31 00:24:50 dtucker Exp $");
+
+#include <sys/types.h>
+
+#include <string.h>
+#include <stdarg.h>
 
 #include "xmalloc.h"
 #include "packet.h"
 #include "log.h"
+#include "key.h"
+#include "hostfile.h"
 #include "auth.h"
+#include "buffer.h"
+#ifdef GSSAPI
+#include "ssh-gss.h"
+#endif
 #include "monitor_wrap.h"
 #include "servconf.h"
 
@@ -57,10 +68,6 @@ userauth_passwd(Authctxt *authctxt)
                logit("password change not supported");
        else if (PRIVSEP(auth_password(authctxt, password)) == 1)
                authenticated = 1;
-#ifdef HAVE_CYGWIN
-       if (check_nt_auth(1, authctxt->pw) == 0)
-               authenticated = 0;
-#endif
        memset(password, 0, len);
        xfree(password);
        return authenticated;