diff options
| author | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-10-28 16:03:53 +0000 |
|---|---|---|
| committer | Dag-Erling Smørgrav <des@FreeBSD.org> | 2004-10-28 16:03:53 +0000 |
| commit | d74d50a84bda49cca847afc2f65bf790d6af7361 (patch) | |
| tree | da81db150f0171c7861edf6e1f6b1fb45f81a6a7 /crypto/openssh/auth-passwd.c | |
| parent | 52028650dba51037ac82f766107619f336a00e25 (diff) | |
| download | src-d74d50a84bda49cca847afc2f65bf790d6af7361.tar.gz src-d74d50a84bda49cca847afc2f65bf790d6af7361.zip | |
Vendor import of OpenSSH 3.9p1.
Notes
Notes:
svn path=/vendor-crypto/openssh/dist/; revision=137015
Diffstat (limited to 'crypto/openssh/auth-passwd.c')
| -rw-r--r-- | crypto/openssh/auth-passwd.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/crypto/openssh/auth-passwd.c b/crypto/openssh/auth-passwd.c index beaf0fa6cbf3..7a68e0562861 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; |