diff options
author | Darren Tucker <dtucker@zip.com.au> | 2004-06-23 09:17:03 +1000 |
---|---|---|
committer | Darren Tucker <dtucker@zip.com.au> | 2004-06-23 09:17:03 +1000 |
commit | 6609de6d11b271b243c4f70e00d17f7f7d60ff8a (patch) | |
tree | 2f10ffef52756f70076a768f0ced64a1b2c7018b | |
parent | f148bb848fefa905b3e6d24957d7f33c27161f40 (diff) |
- (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
connections with empty passwords. Patch from davidwu at nbttech.com,
ok djm@
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | auth1.c | 9 |
2 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,8 @@ +20040623 + - (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1 + connections with empty passwords. Patch from davidwu at nbttech.com, + ok djm@ + 20040524 - (dtucker) [auth-pam.c] Bug #839: Ensure that pam authentication "thread" is terminated if the privsep slave exits during keyboard-interactive @@ -999,4 +1004,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.3316.2.5 2004/05/24 01:53:42 dtucker Exp $ +$Id: ChangeLog,v 1.3316.2.6 2004/06/22 23:17:03 dtucker Exp $ @@ -81,8 +81,13 @@ do_authloop(Authctxt *authctxt) (!options.kerberos_authentication || options.kerberos_or_local_passwd) && #endif PRIVSEP(auth_password(authctxt, ""))) { - auth_log(authctxt, 1, "without authentication", ""); - return; +#ifdef USE_PAM + if (options.use_pam && (PRIVSEP(do_pam_account()))) +#endif + { + auth_log(authctxt, 1, "without authentication", ""); + return; + } } /* Indicate that authentication is needed. */ |