summaryrefslogtreecommitdiffstats
path: root/libexec/ftpd/ftpd.c
diff options
context:
space:
mode:
authoryar <yar@FreeBSD.org>2004-11-22 11:02:42 +0000
committeryar <yar@FreeBSD.org>2004-11-22 11:02:42 +0000
commitc859d4601134c6824837a0577c022679e4a07a39 (patch)
tree0d66e06281f7d397984807af004379573cf2c5a3 /libexec/ftpd/ftpd.c
parent0570780491b2c351d2ca8b7521fa7c496d9ba436 (diff)
downloadFreeBSD-src-c859d4601134c6824837a0577c022679e4a07a39.zip
FreeBSD-src-c859d4601134c6824837a0577c022679e4a07a39.tar.gz
Calling pam_chauthtok() isn't really needed since
an FTP user has no chance to change password anyway. Submitted by: Nick Leuta
Diffstat (limited to 'libexec/ftpd/ftpd.c')
-rw-r--r--libexec/ftpd/ftpd.c10
1 files changed, 3 insertions, 7 deletions
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;
}
}
OpenPOWER on IntegriCloud