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_cracklib | |
| 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_cracklib')
| -rw-r--r-- | modules/pam_cracklib/pam_cracklib.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c index aa55afd4..091a56f5 100644 --- a/modules/pam_cracklib/pam_cracklib.c +++ b/modules/pam_cracklib/pam_cracklib.c @@ -1,6 +1,5 @@ /* * pam_cracklib module - * $Id$ */ /* @@ -572,7 +571,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, token1 = x_strdup(item); item = NULL; } else { - retval = PAM_AUTHTOK_RECOVER_ERR; /* didn't work */ + retval = PAM_AUTHTOK_RECOVERY_ERR; /* didn't work */ } } else { @@ -587,7 +586,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, if (token1 == NULL) { pam_syslog(pamh, LOG_NOTICE, "could not recover authentication token 1"); - retval = PAM_AUTHTOK_RECOVER_ERR; + retval = PAM_AUTHTOK_RECOVERY_ERR; } /* * tidy up the conversation (resp_retcode) is ignored @@ -595,7 +594,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, _pam_drop(resp); } else { retval = (retval == PAM_SUCCESS) ? - PAM_AUTHTOK_RECOVER_ERR:retval ; + PAM_AUTHTOK_RECOVERY_ERR:retval ; } } @@ -657,7 +656,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, if (token2 == NULL) { pam_syslog(pamh,LOG_NOTICE, "could not recover authentication token 2"); - retval = PAM_AUTHTOK_RECOVER_ERR; + retval = PAM_AUTHTOK_RECOVERY_ERR; } /* * tidy up the conversation (resp_retcode) is ignored @@ -665,7 +664,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, _pam_drop(resp); } else { retval = (retval == PAM_SUCCESS) ? - PAM_AUTHTOK_RECOVER_ERR:retval ; + PAM_AUTHTOK_RECOVERY_ERR:retval ; } if (retval != PAM_SUCCESS) { @@ -684,7 +683,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, pam_set_item(pamh, PAM_AUTHTOK, NULL); if (ctrl & PAM_DEBUG_ARG) pam_syslog(pamh,LOG_NOTICE,"Password mistyped"); - retval = PAM_AUTHTOK_RECOVER_ERR; + retval = PAM_AUTHTOK_RECOVERY_ERR; continue; } |