diff options
| author | Steve Langasek <vorlon@debian.org> | 2009-08-25 13:48:57 -0700 |
|---|---|---|
| committer | Steve Langasek <vorlon@debian.org> | 2019-01-08 21:25:57 -0800 |
| commit | 708223f26600f4a245b81b00ee8d92319a8c5464 (patch) | |
| tree | eadd855a00574bae05e1c2e37d0bac12e3018237 /debian | |
| parent | 9e634f29ea8bfdb719a57da61bd04420ab1e5202 (diff) | |
pam_unix-chkpwd-wait also merged upstream
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/patches-applied/pam_unix-chkpwd-wait | 22 | ||||
| -rw-r--r-- | debian/patches-applied/series | 1 |
3 files changed, 1 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index 1db8aae1..b02aef4b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,7 +8,7 @@ pam (1.1.0-1) UNRELEASED; urgency=low Closes: #326407, #514423. * Drop patches pam_unix_thread-safe_save_old_password.patch, pam_env_ignore_garbage.patch, dont_freeze_password_chain, - pam_1.0.4_mindays, pam_mail-fix-quiet, and + pam_1.0.4_mindays, pam_mail-fix-quiet, pam_unix-chkpwd-wait, and cve-2009-0887-libpam-pam_misc.patch, which are included upstream. * Trim pam.d-manpage-section patch, which was mostly but not completely applied upstream. diff --git a/debian/patches-applied/pam_unix-chkpwd-wait b/debian/patches-applied/pam_unix-chkpwd-wait deleted file mode 100644 index f81f6906..00000000 --- a/debian/patches-applied/pam_unix-chkpwd-wait +++ /dev/null @@ -1,22 +0,0 @@ -Index: pam.deb/modules/pam_unix/support.c -=================================================================== ---- pam.deb.orig/modules/pam_unix/support.c -+++ pam.deb/modules/pam_unix/support.c -@@ -504,7 +504,16 @@ - pam_syslog(pamh, LOG_ERR, "unix_chkpwd waitpid returned %d: %m", rc); - retval = PAM_AUTH_ERR; - } else { -- retval = WEXITSTATUS(retval); -+ if (WIFEXITED(retval)) -+ retval = WEXITSTATUS(retval); -+ else { -+ if (WIFSIGNALED(retval)) -+ pam_syslog(pamh, LOG_ERR, "unix_chkpwd exited on signal %d", -+ WTERMSIG(retval)); -+ else -+ pam_syslog(pamh, LOG_ERR, "unix_chkpwd died unexpectedly"); -+ retval = PAM_AUTH_ERR; -+ } - } - } else { - D(("fork failed")); diff --git a/debian/patches-applied/series b/debian/patches-applied/series index e556fe11..d9cf5222 100644 --- a/debian/patches-applied/series +++ b/debian/patches-applied/series @@ -17,6 +17,5 @@ hurd_no_setfsuid 055_pam_unix_nullok_secure PAM-manpage-section pam.d-manpage-section -pam_unix-chkpwd-wait autoconf.patch update-motd |