git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
d6be6b4
)
Fix error message for router headers_remove expansion failure
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sun, 21 Jun 2015 13:36:01 +0000
(14:36 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 23 Jun 2015 08:37:19 +0000
(09:37 +0100)
Associated with Bug 1533
src/src/routers/rf_get_munge_headers.c
patch
|
blob
|
history
diff --git
a/src/src/routers/rf_get_munge_headers.c
b/src/src/routers/rf_get_munge_headers.c
index 48c4bcd78ce0acde20645d998a81798de0d49e17..ecb4ee097de69680e2ec4b89e6d878305716d1f8 100644
(file)
--- 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)
{
{
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;
}
}
return DEFER;
}
}
@@
-96,8
+97,9
@@
if (rblock->remove_headers)
{
if (!expand_string_forcedfail)
{
{
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;
}
}
return DEFER;
}
}
@@
-108,4
+110,6
@@
if (rblock->remove_headers)
return OK;
}
return OK;
}
+/* vi: aw ai sw=4
+*/
/* End of rf_get_munge_headers.c */
/* End of rf_get_munge_headers.c */