From d5d493f03ae792146848e3cba16bb9e667c73125 Mon Sep 17 00:00:00 2001 From: des Date: Thu, 28 Oct 2004 16:03:53 +0000 Subject: Vendor import of OpenSSH 3.9p1. --- crypto/openssh/auth-passwd.c | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'crypto/openssh/auth-passwd.c') diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c index beaf0fa..7a68e05 100644 --- a/crypto/openssh/auth-passwd.c +++ b/crypto/openssh/auth-passwd.c @@ -64,7 +64,9 @@ auth_password(Authctxt *authctxt, const char *password) { struct passwd * pw = authctxt->pw; int ok = authctxt->valid; +#if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) static int expire_checked = 0; +#endif #ifndef HAVE_CYGWIN if (pw->pw_uid == 0 && options.permit_root_login != PERMIT_YES) @@ -91,6 +93,10 @@ auth_password(Authctxt *authctxt, const char *password) return ok; } #endif +#ifdef USE_PAM + if (options.use_pam) + return (sshpam_auth_passwd(authctxt, password) && ok); +#endif #if defined(USE_SHADOW) && defined(HAS_SHADOW_EXPIRE) if (!expire_checked) { expire_checked = 1; -- cgit v1.1