From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 21 Jun 2015 13:36:01 +0000 (+0100)
Subject: Fix error message for router headers_remove expansion failure
X-Git-Tag: exim-4_86_RC4~2
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/7325e67cea1ae80846afe5be73bb2e144b7e686e?hp=d6be6b43a5ba49b4f1abe02a13673bc85f8ec2a7

Fix error message for router headers_remove expansion failure
Associated with Bug 1533
---

diff --git a/src/src/routers/rf_get_munge_headers.c b/src/src/routers/rf_get_munge_headers.c
index 48c4bcd78..ecb4ee097 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 */