From c859d4601134c6824837a0577c022679e4a07a39 Mon Sep 17 00:00:00 2001 From: yar Date: Mon, 22 Nov 2004 11:02:42 +0000 Subject: Calling pam_chauthtok() isn't really needed since an FTP user has no chance to change password anyway. Submitted by: Nick Leuta --- libexec/ftpd/ftpd.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'libexec/ftpd') diff --git a/libexec/ftpd/ftpd.c b/libexec/ftpd/ftpd.c index c0ac3f3..9f575bf 100644 --- a/libexec/ftpd/ftpd.c +++ b/libexec/ftpd/ftpd.c @@ -1297,13 +1297,9 @@ auth_pam(struct passwd **ppw, const char *pass) if (rval == 0) { e = pam_acct_mgmt(pamh, 0); - if (e == PAM_NEW_AUTHTOK_REQD) { - e = pam_chauthtok(pamh, PAM_CHANGE_EXPIRED_AUTHTOK); - if (e != PAM_SUCCESS) { - syslog(LOG_ERR, "pam_chauthtok: %s", pam_strerror(pamh, e)); - rval = 1; - } - } else if (e != PAM_SUCCESS) { + if (e != PAM_SUCCESS) { + syslog(LOG_ERR, "pam_acct_mgmt: %s", + pam_strerror(pamh, e)); rval = 1; } } -- cgit v1.1