Merge branch 'debian' into hcoop_489

[hcoop/debian/exim4.git] / debian / patches / 84_Fix-truncation-of-items-in-headers_remove-lists-this.patch

diff --git a/debian/patches/84_Fix-truncation-of-items-in-headers_remove-lists-this.patch b/debian/patches/84_Fix-truncation-of-items-in-headers_remove-lists-this.patch
deleted file mode 100644 (file)
index a61a06d..0000000
--- a/debian/patches/84_Fix-truncation-of-items-in-headers_remove-lists-this.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 97f83c7a669a525a5f5964a5c0708c311673b87f Mon Sep 17 00:00:00 2001
-From: Jeremy Harris <jgh146exb@wizmail.org>
-Date: Thu, 29 Jan 2015 17:42:47 +0000
-Subject: [PATCH] Fix truncation of items in headers_remove lists, this time in
- routers.  Bug 1533
-
----
- src/src/routers/rf_get_munge_headers.c | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
-
-diff --git a/src/routers/rf_get_munge_headers.c b/src/routers/rf_get_munge_headers.c
-index a4a13b0..3125f31 100644
---- a/src/routers/rf_get_munge_headers.c
-+++ b/src/routers/rf_get_munge_headers.c
-@@ -90,9 +90,8 @@ if (rblock->remove_headers)
-   uschar * list = rblock->remove_headers;
-   int sep = ':';
-   uschar * s;
--  uschar buffer[128];
- 
--  while ((s = string_nextinlist(&list, &sep, buffer, sizeof(buffer))))
-+  while ((s = string_nextinlist(&list, &sep, NULL, 0)))
-     if (!(s = expand_string(s)))
-       {
-       if (!expand_string_forcedfail)
--- 
-2.1.4
-