summaryrefslogtreecommitdiff
path: root/libexec/ftpd
diff options
context:
space:
mode:
authorYaroslav Tykhiy <ytykhiy@gmail.com>2004-11-22 11:02:42 +0000
committerYaroslav Tykhiy <ytykhiy@gmail.com>2004-11-22 11:02:42 +0000
commit4cbc4ad64461cb743e9b88fadf89db15932f8160 (patch)
tree0d66e06281f7d397984807af004379573cf2c5a3 /libexec/ftpd
parente897216f4581a1508214066190cda714d884a052 (diff)
Notes
Diffstat (limited to 'libexec/ftpd')
-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 c0ac3f342772..9f575bff86bf 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;
}
}