From 39291ae866a06109cc31e69583c5bfe76c31074e Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Sun, 27 Jul 2008 01:04:19 -0700 Subject: Drop another patch that's integrated upstream --- .../patches-applied/057_pam_unix_passwd_OOM_check | 21 --------------------- debian/patches-applied/series | 1 - 2 files changed, 22 deletions(-) delete mode 100644 debian/patches-applied/057_pam_unix_passwd_OOM_check (limited to 'debian/patches-applied') 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 -- cgit v1.2.3