- (djm) [auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c]
Make cygwin code more consistent with that which surrounds it
diff --git a/ChangeLog b/ChangeLog
index 9a14a06..85366cb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
failing PAM session modules to user then exit, similar to the way
/etc/nologin is handled. ok djm@
- (dtucker) [auth-pam.c] Relocate sshpam_store_conv(), no code change.
+ - (djm) [auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c]
+ Make cygwin code more consistent with that which surrounds it
20040830
- (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only
@@ -1723,4 +1725,4 @@
- (djm) Trim deprecated options from INSTALL. Mention UsePAM
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
-$Id: ChangeLog,v 1.3542 2004/09/11 12:28:01 dtucker Exp $
+$Id: ChangeLog,v 1.3543 2004/09/11 12:42:09 djm Exp $
diff --git a/auth2-kbdint.c b/auth2-kbdint.c
index 1696ef4..fa83649 100644
--- a/auth2-kbdint.c
+++ b/auth2-kbdint.c
@@ -53,7 +53,7 @@
xfree(lang);
#ifdef HAVE_CYGWIN
if (check_nt_auth(0, authctxt->pw) == 0)
- return(0);
+ authenticated = 0;
#endif
return authenticated;
}
diff --git a/auth2-none.c b/auth2-none.c
index 2bf5b5c..787458d 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -103,7 +103,7 @@
userauth_banner();
#ifdef HAVE_CYGWIN
if (check_nt_auth(1, authctxt->pw) == 0)
- return(0);
+ return (0);
#endif
if (options.password_authentication)
return (PRIVSEP(auth_password(authctxt, "")));
diff --git a/auth2-passwd.c b/auth2-passwd.c
index a4f482d..2321ef4 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -55,12 +55,12 @@
if (change)
logit("password change not supported");
- else if (PRIVSEP(auth_password(authctxt, password)) == 1
-#ifdef HAVE_CYGWIN
- && check_nt_auth(1, authctxt->pw)
-#endif
- )
+ 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;
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 9898d4a..bafea09 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -158,7 +158,7 @@
xfree(pkblob);
#ifdef HAVE_CYGWIN
if (check_nt_auth(0, authctxt->pw) == 0)
- return(0);
+ authenticated = 0;
#endif
return authenticated;
}