Whitespace changes to minimize diffs with OpenSSH.

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

diff --git a/openssh/auth2-passwd.c b/openssh/auth2-passwd.c
index a4f482d2e287fc3fabab717791df4c7db37997de..421c5c25d018ab64c45b9b12a770af8a5d8925b8 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"
 
@@ -55,12 +66,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;