summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--auth2-kbdint.c2
-rw-r--r--auth2-none.c2
-rw-r--r--auth2-passwd.c8
-rw-r--r--auth2-pubkey.c2
5 files changed, 10 insertions, 8 deletions
diff --git a/ChangeLog b/ChangeLog
index 9a14a06ea..85366cbb1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,8 @@
4 failing PAM session modules to user then exit, similar to the way 4 failing PAM session modules to user then exit, similar to the way
5 /etc/nologin is handled. ok djm@ 5 /etc/nologin is handled. ok djm@
6 - (dtucker) [auth-pam.c] Relocate sshpam_store_conv(), no code change. 6 - (dtucker) [auth-pam.c] Relocate sshpam_store_conv(), no code change.
7 - (djm) [auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c]
8 Make cygwin code more consistent with that which surrounds it
7 9
820040830 1020040830
9 - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only 11 - (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only
@@ -1723,4 +1725,4 @@
1723 - (djm) Trim deprecated options from INSTALL. Mention UsePAM 1725 - (djm) Trim deprecated options from INSTALL. Mention UsePAM
1724 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu 1726 - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
1725 1727
1726$Id: ChangeLog,v 1.3542 2004/09/11 12:28:01 dtucker Exp $ 1728$Id: ChangeLog,v 1.3543 2004/09/11 12:42:09 djm Exp $
diff --git a/auth2-kbdint.c b/auth2-kbdint.c
index 1696ef4d3..fa8364975 100644
--- a/auth2-kbdint.c
+++ b/auth2-kbdint.c
@@ -53,7 +53,7 @@ userauth_kbdint(Authctxt *authctxt)
53 xfree(lang); 53 xfree(lang);
54#ifdef HAVE_CYGWIN 54#ifdef HAVE_CYGWIN
55 if (check_nt_auth(0, authctxt->pw) == 0) 55 if (check_nt_auth(0, authctxt->pw) == 0)
56 return(0); 56 authenticated = 0;
57#endif 57#endif
58 return authenticated; 58 return authenticated;
59} 59}
diff --git a/auth2-none.c b/auth2-none.c
index 2bf5b5c80..787458dad 100644
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -103,7 +103,7 @@ userauth_none(Authctxt *authctxt)
103 userauth_banner(); 103 userauth_banner();
104#ifdef HAVE_CYGWIN 104#ifdef HAVE_CYGWIN
105 if (check_nt_auth(1, authctxt->pw) == 0) 105 if (check_nt_auth(1, authctxt->pw) == 0)
106 return(0); 106 return (0);
107#endif 107#endif
108 if (options.password_authentication) 108 if (options.password_authentication)
109 return (PRIVSEP(auth_password(authctxt, ""))); 109 return (PRIVSEP(auth_password(authctxt, "")));
diff --git a/auth2-passwd.c b/auth2-passwd.c
index a4f482d2e..2321ef47b 100644
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -55,12 +55,12 @@ userauth_passwd(Authctxt *authctxt)
55 55
56 if (change) 56 if (change)
57 logit("password change not supported"); 57 logit("password change not supported");
58 else if (PRIVSEP(auth_password(authctxt, password)) == 1 58 else if (PRIVSEP(auth_password(authctxt, password)) == 1)
59 authenticated = 1;
59#ifdef HAVE_CYGWIN 60#ifdef HAVE_CYGWIN
60 && check_nt_auth(1, authctxt->pw) 61 if (check_nt_auth(1, authctxt->pw) == 0)
62 authenticated = 0;
61#endif 63#endif
62 )
63 authenticated = 1;
64 memset(password, 0, len); 64 memset(password, 0, len);
65 xfree(password); 65 xfree(password);
66 return authenticated; 66 return authenticated;
diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 9898d4a63..bafea09da 100644
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -158,7 +158,7 @@ done:
158 xfree(pkblob); 158 xfree(pkblob);
159#ifdef HAVE_CYGWIN 159#ifdef HAVE_CYGWIN
160 if (check_nt_auth(0, authctxt->pw) == 0) 160 if (check_nt_auth(0, authctxt->pw) == 0)
161 return(0); 161 authenticated = 0;
162#endif 162#endif
163 return authenticated; 163 return authenticated;
164} 164}