diff options
| author | Günther Deschner <gd@samba.org> | 2007-02-13 11:04:10 +0000 |
|---|---|---|
| committer | Günther Deschner <gd@samba.org> | 2007-02-13 11:04:10 +0000 |
| commit | 921c89aff6489d3ba95ccab15fe730b0a7ea5282 (patch) | |
| tree | fef65f5745ad6eafce3d79637c04dac23e62e982 | |
| parent | cbe6fcd701f11c53f2bd36a74bafaf50994caed6 (diff) | |
| download | samba-921c89aff6489d3ba95ccab15fe730b0a7ea5282.tar.gz samba-921c89aff6489d3ba95ccab15fe730b0a7ea5282.tar.xz samba-921c89aff6489d3ba95ccab15fe730b0a7ea5282.zip | |
r21310: Fix invalid printfs in pam_winbind.
Guenther
| -rw-r--r-- | source/nsswitch/pam_winbind.c | 32 |
1 files changed, 20 insertions, 12 deletions
diff --git a/source/nsswitch/pam_winbind.c b/source/nsswitch/pam_winbind.c index 67e7767a0f4..bf61b3791dc 100644 --- a/source/nsswitch/pam_winbind.c +++ b/source/nsswitch/pam_winbind.c @@ -461,8 +461,12 @@ static int pam_winbind_request(pam_handle_t * pamh, int ctrl, case WINBINDD_GETPWNAM: case WINBINDD_LOOKUPNAME: - _pam_log(pamh, ctrl, LOG_ERR, "request failed: %s, NT error was %s", + if (strlen(response->data.auth.nt_status_string) > 0) { + _pam_log(pamh, ctrl, LOG_ERR, "request failed, NT error was %s", response->data.auth.nt_status_string); + } else { + _pam_log(pamh, ctrl, LOG_ERR, "request failed"); + } return PAM_USER_UNKNOWN; default: break; @@ -518,15 +522,19 @@ static int pam_winbind_request_log(pam_handle_t * pamh, } return retval; case PAM_SUCCESS: - if (req_type == WINBINDD_PAM_AUTH) { - /* Otherwise, the authentication looked good */ - _pam_log(pamh, ctrl, LOG_NOTICE, "user '%s' granted access", user); - } else if (req_type == WINBINDD_PAM_CHAUTHTOK) { - /* Otherwise, the authentication looked good */ - _pam_log(pamh, ctrl, LOG_NOTICE, "user '%s' password changed", user); - } else { - /* Otherwise, the authentication looked good */ - _pam_log(pamh, ctrl, LOG_NOTICE, "user '%s' OK", user); + /* Otherwise, the authentication looked good */ + switch (req_type) { + case WINBINDD_INFO: + break; + case WINBINDD_PAM_AUTH: + _pam_log(pamh, ctrl, LOG_NOTICE, "user '%s' granted access", user); + break; + case WINBINDD_PAM_CHAUTHTOK: + _pam_log(pamh, ctrl, LOG_NOTICE, "user '%s' password changed", user); + break; + default: + _pam_log(pamh, ctrl, LOG_NOTICE, "user '%s' OK", user); + break; } return retval; @@ -1101,8 +1109,8 @@ static int winbind_auth_request(pam_handle_t * pamh, if (already_expired == True) { _pam_log_debug(pamh, ctrl, LOG_DEBUG, "Password has expired " - "(Password was last set: %d, the policy says " - "it should expire here %d (now it's: %d))\n", + "(Password was last set: %lld, the policy says " + "it should expire here %lld (now it's: %lu))\n", response.data.auth.info3.pass_last_set_time, response.data.auth.info3.pass_last_set_time + response.data.auth.policy.expire, |