summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThorsten Kukuk <kukuk@thkukuk.de>2006-08-28 09:50:23 +0000
committerThorsten Kukuk <kukuk@thkukuk.de>2006-08-28 09:50:23 +0000
commit6fefdd6724fc7618a263bb69c03851cc4f46d3fc (patch)
tree7d4b732ec6697b30790432cc4995202ea332f5e9
parente2b06236b68771eba8dabba931d091c4dfe9bb6f (diff)
Relevant BUGIDs:
Purpose of commit: cleanup Commit summary: --------------- 2006-08-28 Thorsten Kukuk <kukuk@thkukuk.de> * modules/pam_cracklib/pam_cracklib.c (pam_sm_chauthtok): Remove duplicate code.
-rw-r--r--ChangeLog5
-rw-r--r--modules/pam_cracklib/pam_cracklib.c7
2 files changed, 7 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 46b3efb0..099c5f1e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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");