diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2006-01-08 09:36:55 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2006-01-08 09:36:55 +0000 |
| commit | 72609d111cf62c3de59b340cd60922ad58456868 (patch) | |
| tree | 2598d043d05872f81656e41ab7577fc1d7d62ad6 /modules/pam_unix | |
| parent | 7308b7954b02c4fd7e34c7b01a1099ec59751b9a (diff) | |
| download | pam-72609d111cf62c3de59b340cd60922ad58456868.tar.gz pam-72609d111cf62c3de59b340cd60922ad58456868.tar.bz2 pam-72609d111cf62c3de59b340cd60922ad58456868.zip | |
Relevant BUGIDs:
Purpose of commit: cleanup
Commit summary:
---------------
2006-01-08 Thorsten Kukuk <kukuk@thkukuk.de>
* modules/pam_cracklib/pam_cracklib.c: Use PAM_AUTHTOK_RECOVERY_ERR
instead of PAM_AUTHTOK_RECOVER_ERR.
* modules/pam_pwdb/support.-c: Likewise.
* modules/pam_unix/support.c: Likewise.
* modules/pam_userdb/pam_userdb.c (pam_sm_authenticate): Likewise.
* libpam/pam_strerror.c (pam_strerror): Likewise.
* libpam/include/security/_pam_compat.h: Define
PAM_AUTHTOK_RECOVER_ERR for backward compatibility.
* libpam/include/security/_pam_types.h: Rename
PAM_AUTHTOK_RECOVER_ERR to PAM_AUTHTOK_RECOVERY_ERR.
Diffstat (limited to 'modules/pam_unix')
| -rw-r--r-- | modules/pam_unix/support.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/modules/pam_unix/support.c b/modules/pam_unix/support.c index 733c25c2..cb89eb31 100644 --- a/modules/pam_unix/support.c +++ b/modules/pam_unix/support.c @@ -1,6 +1,4 @@ /* - * $Id$ - * * Copyright information at end of file. */ @@ -527,7 +525,7 @@ static int _unix_run_helper_binary(pam_handle_t *pamh, const char *passwd, out if pam is called from setuid binary (su, sudo...) */ setuid(0); } - + /* exec binary helper */ args[0] = x_strdup(CHKPWD_HELPER); args[1] = x_strdup(user); @@ -865,7 +863,7 @@ int _unix_read_password(pam_handle_t * pamh } else if (*pass != NULL) { /* we have a password! */ return PAM_SUCCESS; } else if (on(UNIX_USE_FIRST_PASS, ctrl)) { - return PAM_AUTHTOK_RECOVER_ERR; /* didn't work */ + return PAM_AUTHTOK_RECOVERY_ERR; /* didn't work */ } else if (on(UNIX_USE_AUTHTOK, ctrl) && off(UNIX__OLD_PASSWD, ctrl)) { return PAM_AUTHTOK_ERR; @@ -883,11 +881,11 @@ int _unix_read_password(pam_handle_t * pamh if (comment != NULL && off(UNIX__QUIET, ctrl)) { retval = pam_info(pamh, "%s", comment); } - + if (retval == PAM_SUCCESS) { retval = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, &resp[0], "%s", prompt1); - + if (retval == PAM_SUCCESS && prompt2 != NULL) { retval = pam_prompt(pamh, PAM_PROMPT_ECHO_OFF, &resp[1], "%s", prompt2); @@ -906,7 +904,7 @@ int _unix_read_password(pam_handle_t * pamh /* verify that password entered correctly */ if (strcmp(token, resp[replies - 1])) { /* mistyped */ - retval = PAM_AUTHTOK_RECOVER_ERR; + retval = PAM_AUTHTOK_RECOVERY_ERR; _make_remark(pamh, ctrl, PAM_ERROR_MSG, MISTYPED_PASS); } @@ -920,9 +918,9 @@ int _unix_read_password(pam_handle_t * pamh } else { retval = (retval == PAM_SUCCESS) - ? PAM_AUTHTOK_RECOVER_ERR : retval; + ? PAM_AUTHTOK_RECOVERY_ERR : retval; } - + resp[0] = NULL; if (replies > 1) _pam_delete(resp[1]); @@ -930,7 +928,7 @@ int _unix_read_password(pam_handle_t * pamh if (retval != PAM_SUCCESS) { _pam_delete(token); - + if (on(UNIX_DEBUG, ctrl)) pam_syslog(pamh, LOG_DEBUG, "unable to obtain a password"); |