diff options
| author | Tomas Mraz <tm@t8m.info> | 2005-09-20 13:54:17 +0000 |
|---|---|---|
| committer | Tomas Mraz <tm@t8m.info> | 2005-09-20 13:54:17 +0000 |
| commit | 5e5e58a8439b333a1f298ecee83e49f18651acc4 (patch) | |
| tree | 39e4b19c70accc18c3547f9485444d6efa3bc553 | |
| parent | 3c830a3511a4188cba1d75ffbab60b0834840ebf (diff) | |
| download | pam-5e5e58a8439b333a1f298ecee83e49f18651acc4.tar.gz pam-5e5e58a8439b333a1f298ecee83e49f18651acc4.tar.bz2 pam-5e5e58a8439b333a1f298ecee83e49f18651acc4.zip | |
Relevant BUGIDs:
Purpose of commit: bugfix
Commit summary:
---------------
pam_unix: Always honor nis flag on password change (by Aaron Hope)
| -rw-r--r-- | CHANGELOG | 1 | ||||
| -rw-r--r-- | modules/pam_unix/pam_unix_passwd.c | 6 |
2 files changed, 4 insertions, 3 deletions
@@ -63,6 +63,7 @@ bug report - outstanding bugs are listed here: * pam_echo: New PAM module for message output (kukuk) * pam_limits: Fix regression from RLIMIT_NICE support (wrong limit values for other limits are applied) patch by Anton Guda +* pam_unix: Always honor nis flag on password change (by Aaron Hope) 0.80: Wed Jul 13 13:23:20 CEST 2005 * pam_tally: test for NULL data before dereferencing them (t8m) diff --git a/modules/pam_unix/pam_unix_passwd.c b/modules/pam_unix/pam_unix_passwd.c index 7eb9bc73..54b3de83 100644 --- a/modules/pam_unix/pam_unix_passwd.c +++ b/modules/pam_unix/pam_unix_passwd.c @@ -1051,10 +1051,10 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t * pamh, int flags, * getpwnam() doesn't tell you *where* the information it gives you * came from, nor should it. That's our job. */ - if (_unix_comesfromsource(pamh, user, 1, 1) == 0) { + if (_unix_comesfromsource(pamh, user, 1, on(UNIX_NIS, ctrl)) == 0) { _log_err(LOG_DEBUG, pamh, - "user \"%s\" does not exist in /etc/passwd or NIS", - user); + "user \"%s\" does not exist in /etc/passwd%s", + user, on(UNIX_NIS, ctrl) ? " or NIS" : ""); return PAM_USER_UNKNOWN; } else { struct passwd *pwd; |