aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorvorlon <Unknown>2007-08-30 07:07:34 +0000
committervorlon <Unknown>2007-08-30 07:07:34 +0000
commitcf400ab56489418f28a9a7e5b344f7fee8ad07b8 (patch)
treeea4210f42a7b565e27ea6d98ae0be4db177a3fa5
parent81295bb364b6c70467cae82c55e6cb20f718c9a4 (diff)
downloadpam-cf400ab56489418f28a9a7e5b344f7fee8ad07b8.tar.gz
pam-cf400ab56489418f28a9a7e5b344f7fee8ad07b8.tar.bz2
pam-cf400ab56489418f28a9a7e5b344f7fee8ad07b8.zip
Drop the remainder of 061_pam_issue_double_free, not required for the
original bugfix.
-rw-r--r--changelog4
-rw-r--r--patches-applied/061_pam_issue_double_free15
-rw-r--r--patches-applied/series1
3 files changed, 3 insertions, 17 deletions
diff --git a/changelog b/changelog
index ff85d134..989abd35 100644
--- a/changelog
+++ b/changelog
@@ -23,8 +23,10 @@ pam (0.99.7.1-4) UNRELEASED; urgency=low
* 019_pam_listfile_quiet: per discussion with upstream, don't suppress
errors about missing files or files with wrong permissions; these are
real errors that should not be buried.
+ * Drop the remainder of 061_pam_issue_double_free, not required for the
+ original bugfix.
- -- Steve Langasek <vorlon@debian.org> Wed, 29 Aug 2007 15:13:27 -0700
+ -- Steve Langasek <vorlon@debian.org> Thu, 30 Aug 2007 00:05:38 -0700
pam (0.99.7.1-3) unstable; urgency=low
diff --git a/patches-applied/061_pam_issue_double_free b/patches-applied/061_pam_issue_double_free
deleted file mode 100644
index d6443164..00000000
--- a/patches-applied/061_pam_issue_double_free
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: Linux-PAM/modules/pam_issue/pam_issue.c
-===================================================================
---- Linux-PAM/modules/pam_issue/pam_issue.c.orig
-+++ Linux-PAM/modules/pam_issue/pam_issue.c
-@@ -65,6 +65,10 @@
- for ( ; argc-- > 0 ; ++argv ) {
- if (!strncmp(*argv,"issue=",6)) {
- issue_file = 6 + *argv;
-+ if (*issue_file == '\0') {
-+ D(("empty issue= value - ignored"));
-+ return PAM_IGNORE;
-+ }
- D(("set issue_file to: %s", issue_file));
- } else if (!strcmp(*argv,"noesc")) {
- parse_esc = 0;
diff --git a/patches-applied/series b/patches-applied/series
index 15b52e9e..db1c6f39 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
-061_pam_issue_double_free -p0
063_paswd_segv -p0
064_pam_unix_cracklib_dictpath
065_pam_unix_cracklib_disable