summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches-applied/057_pam_unix_passwd_OOM_check21
-rw-r--r--debian/patches-applied/series1
3 files changed, 2 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog
index 3c354f60..3e126c55 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,7 +21,8 @@ pam (1.0.1-1) UNRELEASED; urgency=low
019_pam_listfile_quiet, 024_debian_cracklib_dict_path, 038_support_hurd,
043_pam_unix_unknown_user_not_alert, 046_pam_group_example,
no_pthread_mutexes, limits_wrong_strncpy, misc_conv_allow_sigint.patch,
- and pam_tally_audit.patch, which have been merged upstream.
+ pam_tally_audit.patch, and 057_pam_unix_passwd_OOM_check, which have been
+ merged upstream.
* Patch 022_pam_unix_group_time_miscfixes: partially merged upstream;
now is really just "pam_group_miscfixes".
* Patch 007_modules_pam_unix partially superseded upstream; stripping
diff --git a/debian/patches-applied/057_pam_unix_passwd_OOM_check b/debian/patches-applied/057_pam_unix_passwd_OOM_check
deleted file mode 100644
index afae12e1..00000000
--- a/debian/patches-applied/057_pam_unix_passwd_OOM_check
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: Linux-PAM/modules/pam_unix/pam_unix_passwd.c
-===================================================================
---- Linux-PAM/modules/pam_unix/pam_unix_passwd.c.orig
-+++ Linux-PAM/modules/pam_unix/pam_unix_passwd.c
-@@ -1323,6 +1323,16 @@
- }
- }
-
-+ /* A null pointer here indicates a memory failure
-+ somewhere along the way; don't set the password to
-+ NULL! */
-+ if (tpass == NULL) {
-+ pam_syslog(pamh, LOG_CRIT,
-+ "out of memory for password");
-+ pass_new = pass_old = NULL; /* tidy up */
-+ return PAM_BUF_ERR;
-+ }
-+
- D(("password processed"));
-
- /* update the password database(s) -- race conditions..? */
diff --git a/debian/patches-applied/series b/debian/patches-applied/series
index 24a0f6df..83c6c0f6 100644
--- a/debian/patches-applied/series
+++ b/debian/patches-applied/series
@@ -17,7 +17,6 @@ hurd_no_setfsuid
045_pam_dispatch_jump_is_ignore
054_pam_security_abstract_securetty_handling
055_pam_unix_nullok_secure
-057_pam_unix_passwd_OOM_check
065_pam_unix_cracklib_disable
PAM-manpage-section
pam_env_ignore_garbage.patch -p2