- (djm) [auth2-kbdint.c auth2-none.c auth2-passwd.c auth2-pubkey.c]
Make cygwin code more consistent with that which surrounds it
This commit is contained in:
parent
0a7e3c6c89
commit
4765679649
|
@ -4,6 +4,8 @@
|
||||||
failing PAM session modules to user then exit, similar to the way
|
failing PAM session modules to user then exit, similar to the way
|
||||||
/etc/nologin is handled. ok djm@
|
/etc/nologin is handled. ok djm@
|
||||||
- (dtucker) [auth-pam.c] Relocate sshpam_store_conv(), no code change.
|
- (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
|
20040830
|
||||||
- (dtucker) [session.c openbsd-compat/bsd-cygwin_util.{c,h}] Bug #915: only
|
- (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) Trim deprecated options from INSTALL. Mention UsePAM
|
||||||
- (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
|
- (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 $
|
||||||
|
|
|
@ -53,7 +53,7 @@ userauth_kbdint(Authctxt *authctxt)
|
||||||
xfree(lang);
|
xfree(lang);
|
||||||
#ifdef HAVE_CYGWIN
|
#ifdef HAVE_CYGWIN
|
||||||
if (check_nt_auth(0, authctxt->pw) == 0)
|
if (check_nt_auth(0, authctxt->pw) == 0)
|
||||||
return(0);
|
authenticated = 0;
|
||||||
#endif
|
#endif
|
||||||
return authenticated;
|
return authenticated;
|
||||||
}
|
}
|
||||||
|
|
|
@ -103,7 +103,7 @@ userauth_none(Authctxt *authctxt)
|
||||||
userauth_banner();
|
userauth_banner();
|
||||||
#ifdef HAVE_CYGWIN
|
#ifdef HAVE_CYGWIN
|
||||||
if (check_nt_auth(1, authctxt->pw) == 0)
|
if (check_nt_auth(1, authctxt->pw) == 0)
|
||||||
return(0);
|
return (0);
|
||||||
#endif
|
#endif
|
||||||
if (options.password_authentication)
|
if (options.password_authentication)
|
||||||
return (PRIVSEP(auth_password(authctxt, "")));
|
return (PRIVSEP(auth_password(authctxt, "")));
|
||||||
|
|
|
@ -55,12 +55,12 @@ userauth_passwd(Authctxt *authctxt)
|
||||||
|
|
||||||
if (change)
|
if (change)
|
||||||
logit("password change not supported");
|
logit("password change not supported");
|
||||||
else if (PRIVSEP(auth_password(authctxt, password)) == 1
|
else if (PRIVSEP(auth_password(authctxt, password)) == 1)
|
||||||
#ifdef HAVE_CYGWIN
|
|
||||||
&& check_nt_auth(1, authctxt->pw)
|
|
||||||
#endif
|
|
||||||
)
|
|
||||||
authenticated = 1;
|
authenticated = 1;
|
||||||
|
#ifdef HAVE_CYGWIN
|
||||||
|
if (check_nt_auth(1, authctxt->pw) == 0)
|
||||||
|
authenticated = 0;
|
||||||
|
#endif
|
||||||
memset(password, 0, len);
|
memset(password, 0, len);
|
||||||
xfree(password);
|
xfree(password);
|
||||||
return authenticated;
|
return authenticated;
|
||||||
|
|
|
@ -158,7 +158,7 @@ done:
|
||||||
xfree(pkblob);
|
xfree(pkblob);
|
||||||
#ifdef HAVE_CYGWIN
|
#ifdef HAVE_CYGWIN
|
||||||
if (check_nt_auth(0, authctxt->pw) == 0)
|
if (check_nt_auth(0, authctxt->pw) == 0)
|
||||||
return(0);
|
authenticated = 0;
|
||||||
#endif
|
#endif
|
||||||
return authenticated;
|
return authenticated;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue