[exim-dev] [Bug 1533] headers_remove items size-limited

https://bugs.exim.org/show_bug.cgi?id=1533

--- Comment #13 from Git Commit <git@???> ---
Git commit:
http://git.exim.org/exim.git/commitdiff/7325e67cea1ae80846afe5be73bb2e144b7e686e

commit 7325e67cea1ae80846afe5be73bb2e144b7e686e
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Sun Jun 21 14:36:01 2015 +0100
Commit:     Jeremy Harris <jgh146exb@???>
CommitDate: Tue Jun 23 09:37:19 2015 +0100

    Fix error message for router headers_remove expansion failure
    Associated with Bug 1533
---
 src/src/routers/rf_get_munge_headers.c | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/src/routers/rf_get_munge_headers.c
b/src/src/routers/rf_get_munge_headers.c
index 48c4bcd..ecb4ee0 100644
--- a/src/src/routers/rf_get_munge_headers.c
+++ b/src/src/routers/rf_get_munge_headers.c
@@ -46,8 +46,9 @@ if (rblock->extra_headers)
       {
       if (!expand_string_forcedfail)
     {
-    addr->message = string_sprintf("%s router failed to expand \"%s\": %s",
-      rblock->name, rblock->extra_headers, expand_string_message);
+    addr->message = string_sprintf(
+      "%s router failed to expand add_headers item \"%s\": %s",
+      rblock->name, s, expand_string_message);
     return DEFER;
     }
       }
@@ -96,8 +97,9 @@ if (rblock->remove_headers)
       {
       if (!expand_string_forcedfail)
     {
-    addr->message = string_sprintf("%s router failed to expand \"%s\": %s",
-      rblock->name, rblock->remove_headers, expand_string_message);
+    addr->message = string_sprintf(
+      "%s router failed to expand remove_headers item \"%s\": %s",
+      rblock->name, s, expand_string_message);
     return DEFER;
     }
       }
@@ -108,4 +110,6 @@ if (rblock->remove_headers)
 return OK;
 }

+/* vi: aw ai sw=4
+*/
/* End of rf_get_munge_headers.c */

--
You are receiving this mail because:
You are on the CC list for the bug.