summaryrefslogtreecommitdiffstats
path: root/auth1.c
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2004-06-23 01:17:54 +0200
committerDarren Tucker <dtucker@zip.com.au>2004-06-23 01:17:54 +0200
commita8c73d3b8c471aaeca90e8d82e28014608bf2707 (patch)
treecf6f13652f88125b972f3078d906e1edc0357a31 /auth1.c
parent - dtucker@cvs.openbsd.org 2004/06/22 05:05:45 (diff)
downloadopenssh-a8c73d3b8c471aaeca90e8d82e28014608bf2707.tar.xz
openssh-a8c73d3b8c471aaeca90e8d82e28014608bf2707.zip
- (dtucker) [auth1.c] Ensure do_pam_account is called for Protocol 1
connections with empty passwords. Patch from davidwu at nbttech.com, ok djm@
Diffstat (limited to 'auth1.c')
-rw-r--r--auth1.c9
1 files changed, 7 insertions, 2 deletions
diff --git a/auth1.c b/auth1.c
index e541935ce..ab6fd34dd 100644
--- a/auth1.c
+++ b/auth1.c
@@ -79,8 +79,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. */