diff options
| author | Thorsten Kukuk <kukuk@thkukuk.de> | 2009-07-21 13:59:24 +0000 |
|---|---|---|
| committer | Thorsten Kukuk <kukuk@thkukuk.de> | 2009-07-21 13:59:24 +0000 |
| commit | 15ea8d1c2d1f0899e3a4caa6c3482b2f01647cdf (patch) | |
| tree | b716f0c99e7e329763532929ae947e3580ad3551 /modules/pam_cracklib | |
| parent | 2037cd51a2b787c492d60c9235b85868f03ed9ba (diff) | |
| download | pam-15ea8d1c2d1f0899e3a4caa6c3482b2f01647cdf.tar.gz pam-15ea8d1c2d1f0899e3a4caa6c3482b2f01647cdf.tar.bz2 pam-15ea8d1c2d1f0899e3a4caa6c3482b2f01647cdf.zip | |
Relevant BUGIDs:
Purpose of commit: bugfix
Commit summary:
---------------
2009-07-21 Thorsten Kukuk <kukuk@thkukuk.de>
* modules/pam_cracklib/pam_cracklib.c (pam_sm_chauthtok): Delete
new token if it does not match strength criteria.
Diffstat (limited to 'modules/pam_cracklib')
| -rw-r--r-- | modules/pam_cracklib/pam_cracklib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c index ba64aae2..cf383b2c 100644 --- a/modules/pam_cracklib/pam_cracklib.c +++ b/modules/pam_cracklib/pam_cracklib.c @@ -545,7 +545,7 @@ static int _pam_unix_approve_pass(pam_handle_t *pamh, const char *pass_new) { const char *msg = NULL; - const void *user; + const char *user; int retval; if (pass_new == NULL || (pass_old && !strcmp(pass_old,pass_new))) { @@ -556,7 +556,7 @@ static int _pam_unix_approve_pass(pam_handle_t *pamh, return PAM_AUTHTOK_ERR; } - retval = pam_get_item(pamh, PAM_USER, &user); + retval = pam_get_user(pamh, &user, NULL); if (retval != PAM_SUCCESS || user == NULL) { if (ctrl & PAM_DEBUG_ARG) pam_syslog(pamh,LOG_ERR,"Can not get username"); @@ -658,6 +658,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, pam_error (pamh, _("BAD PASSWORD: %s"), crack_msg); if (getuid() || (flags & PAM_CHANGE_EXPIRED_AUTHTOK)) { + pam_set_item (pamh, PAM_AUTHTOK, NULL); retval = PAM_AUTHTOK_ERR; continue; } @@ -670,6 +671,7 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, if (retval != PAM_SUCCESS) { if (getuid() || (flags & PAM_CHANGE_EXPIRED_AUTHTOK)) { + pam_set_item(pamh, PAM_AUTHTOK, NULL); retval = PAM_AUTHTOK_ERR; continue; } |