diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2011-04-25 13:37:00 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2018-05-31 22:45:18 +0200 |
| commit | 75a4a592e5ccda30715f93563d741b83e0dcf39e (patch) | |
| tree | 502f745607e77a2c4386ad38d818ddcafe81489c /extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch | |
| parent | b76270bf9e6dd375e495fec92140a79a79415d27 (diff) | |
| download | current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.gz current-75a4a592e5ccda30715f93563d741b83e0dcf39e.tar.xz | |
Slackware 13.37slackware-13.37
Mon Apr 25 13:37:00 UTC 2011
Slackware 13.37 x86_64 stable is released!
Thanks to everyone who pitched in on this release: the Slackware team,
the folks producing upstream code, and linuxquestions.org for providing
a great forum for collaboration and testing.
The ISOs are off to be replicated, a 6 CD-ROM 32-bit set and a
dual-sided
32-bit/64-bit x86/x86_64 DVD. Please consider supporting the Slackware
project by picking up a copy from store.slackware.com. We're taking
pre-orders now, and offer a discount if you sign up for a subscription.
As always, thanks to the Slackware community for testing, suggestions,
and feedback. :-)
Have fun!
Diffstat (limited to 'extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch')
| -rw-r--r-- | extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch | 54 |
1 files changed, 54 insertions, 0 deletions
diff --git a/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch b/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch new file mode 100644 index 000000000..6117b26ea --- /dev/null +++ b/extra/source/pam/patches/pam-1.1.3-pwhistory-incomplete.patch @@ -0,0 +1,54 @@ +diff -up Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c.incomplete Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c +--- Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c.incomplete 2008-12-18 14:09:36.000000000 +0100 ++++ Linux-PAM-1.1.3/modules/pam_pwhistory/pam_pwhistory.c 2010-11-11 14:45:02.000000000 +0100 +@@ -187,12 +187,13 @@ pam_sm_chauthtok (pam_handle_t *pamh, in + { + retval = pam_get_authtok (pamh, PAM_AUTHTOK, &newpass, NULL); + if (retval != PAM_SUCCESS && retval != PAM_TRY_AGAIN) +- return retval; ++ { ++ if (retval == PAM_CONV_AGAIN) ++ retval = PAM_INCOMPLETE; ++ return retval; ++ } + tries++; + +- if (newpass == NULL || retval == PAM_TRY_AGAIN) +- continue; +- + if (options.debug) + { + if (newpass) +@@ -201,12 +202,8 @@ pam_sm_chauthtok (pam_handle_t *pamh, in + pam_syslog (pamh, LOG_DEBUG, "got no auth token"); + } + +- if (retval != PAM_SUCCESS || newpass == NULL) +- { +- if (retval == PAM_CONV_AGAIN) +- retval = PAM_INCOMPLETE; +- return retval; +- } ++ if (newpass == NULL || retval == PAM_TRY_AGAIN) ++ continue; + + if (options.debug) + pam_syslog (pamh, LOG_DEBUG, "check against old password file"); +@@ -219,7 +216,6 @@ pam_sm_chauthtok (pam_handle_t *pamh, in + newpass = NULL; + /* Remove password item, else following module will use it */ + pam_set_item (pamh, PAM_AUTHTOK, (void *) NULL); +- continue; + } + } + +@@ -230,8 +226,7 @@ pam_sm_chauthtok (pam_handle_t *pamh, in + return PAM_MAXTRIES; + } + +- /* Remember new password */ +- return pam_set_item (pamh, PAM_AUTHTOK, newpass); ++ return PAM_SUCCESS; + } + + |