aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--changelog3
-rw-r--r--patches-applied/063_paswd_segv21
-rw-r--r--patches-applied/series1
3 files changed, 2 insertions, 23 deletions
diff --git a/changelog b/changelog
index 4604e137..f45d4691 100644
--- a/changelog
+++ b/changelog
@@ -27,8 +27,9 @@ pam (0.99.7.1-4) UNRELEASED; urgency=low
original bugfix.
* Drop patch 064_pam_unix_cracklib_dictpath, which is not needed now that
we define CRACKLIB_DICTS in debian/rules.
+ * Drop patch 063_paswd_segv, superseded by a different upstream fix
- -- Steve Langasek <vorlon@debian.org> Thu, 30 Aug 2007 00:42:25 -0700
+ -- Steve Langasek <vorlon@debian.org> Thu, 30 Aug 2007 01:23:29 -0700
pam (0.99.7.1-3) unstable; urgency=low
diff --git a/patches-applied/063_paswd_segv b/patches-applied/063_paswd_segv
deleted file mode 100644
index fc187788..00000000
--- a/patches-applied/063_paswd_segv
+++ /dev/null
@@ -1,21 +0,0 @@
-Patch for Debian bug #360657
-
-Fix a segfault when the user presses ^D at a password prompt
-
-Authors: Dann Frazier <dannf@debian.org>
-
-Upstream status: not yet submitted
-
-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
-@@ -1235,7 +1235,7 @@
- * password is acceptable.
- */
-
-- if (*(const char *)pass_new == '\0') { /* "\0" password = NULL */
-+ if (pass_new && *(const char *)pass_new == '\0') { /* "\0" password = NULL */
- pass_new = NULL;
- }
- retval = _pam_unix_approve_pass(pamh, ctrl, pass_old, pass_new);
diff --git a/patches-applied/series b/patches-applied/series
index bed3bd5b..e7b48e7f 100644
--- a/patches-applied/series
+++ b/patches-applied/series
@@ -23,7 +23,6 @@ hurd_no_setfsuid -p0
054_pam_security_abstract_securetty_handling -p0
055_pam_unix_nullok_secure -p0
057_pam_unix_passwd_OOM_check -p0
-063_paswd_segv -p0
065_pam_unix_cracklib_disable
PAM-manpage-section
no_pthread_mutexes