- (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 7395e72024d76f919e345e06c1bd6a3f2b4e2ba7..78b873cebd616f93c81e2950da19942a4be8e1ec 100644 (file)
--- 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

diff --git a/auth2-kbdint.c b/auth2-kbdint.c
index 1696ef4d3b55cb318f63d8114c3a7a3747ac1131..fa83649755a33c817f780cf84f984119dd0f9a8d 100644 (file)
--- a/auth2-kbdint.c
+++ b/auth2-kbdint.c
@@ -53,7 +53,7 @@ userauth_kbdint(Authctxt *authctxt)
        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 2bf5b5c80c931123438a6606e031e49ded76601b..787458dadd7fc407f6a95e45eccf2f635377be65 100644 (file)
--- a/auth2-none.c
+++ b/auth2-none.c
@@ -103,7 +103,7 @@ userauth_none(Authctxt *authctxt)
        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 a4f482d2e287fc3fabab717791df4c7db37997de..2321ef47be38145250fc16b51354d3d7d2a44cd5 100644 (file)
--- a/auth2-passwd.c
+++ b/auth2-passwd.c
@@ -55,12 +55,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;

diff --git a/auth2-pubkey.c b/auth2-pubkey.c
index 9898d4a63b8c4fd907f7bad58c99e014bf40a6e5..bafea09dabf240aa57434021c2b53964740a711b 100644 (file)
--- a/auth2-pubkey.c
+++ b/auth2-pubkey.c
@@ -158,7 +158,7 @@ done:
        xfree(pkblob);
 #ifdef HAVE_CYGWIN
        if (check_nt_auth(0, authctxt->pw) == 0)
-               return(0);
+               authenticated = 0;
 #endif
        return authenticated;
 }