diff options
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | modules/pam_cracklib/pam_cracklib.c | 7 |
2 files changed, 7 insertions, 5 deletions
@@ -1,3 +1,8 @@ +2006-08-28 Thorsten Kukuk <kukuk@thkukuk.de> + + * modules/pam_cracklib/pam_cracklib.c (pam_sm_chauthtok): Remove + duplicate code. + 2006-08-24 Thorsten Kukuk <kukuk@thkukuk.de> * release version 0.99.6.2 diff --git a/modules/pam_cracklib/pam_cracklib.c b/modules/pam_cracklib/pam_cracklib.c index 3ca4eb40..204132d4 100644 --- a/modules/pam_cracklib/pam_cracklib.c +++ b/modules/pam_cracklib/pam_cracklib.c @@ -661,13 +661,10 @@ PAM_EXTERN int pam_sm_chauthtok(pam_handle_t *pamh, int flags, * tidy up the conversation (resp_retcode) is ignored */ _pam_drop(resp); - } else { - if (ctrl && PAM_DEBUG_ARG) - pam_syslog(pamh, LOG_DEBUG, - "unable to obtain the password a second time"); - continue; } + /* No else, the a retval == PAM_SUCCESS path can change retval + to a failure code. */ if (retval != PAM_SUCCESS) { if (ctrl && PAM_DEBUG_ARG) pam_syslog(pamh,LOG_DEBUG,"unable to obtain retyped password"); |