diff options
| author | Phil Pennock <pdp@exim.org> | 2011-02-12 21:49:36 -0500 |
|---|---|---|
| committer | Phil Pennock <pdp@exim.org> | 2011-02-12 21:49:36 -0500 |
| commit | b72aab7255159ea38ddcd7eef1051da0f07a7b8d (patch) | |
| tree | 9798995b54439aa3a396ec71e5ac7e7103a2fc67 | |
| parent | ba41f854dbd18de752007eda385de12aa1fc4afb (diff) | |
Escape lookup deferral error message when logging.
closes bug 1083
Patch from John Horne.
| -rw-r--r-- | doc/doc-txt/ChangeLog | 3 | ||||
| -rw-r--r-- | src/src/expand.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog index 135213b2d..5d636a74d 100644 --- a/doc/doc-txt/ChangeLog +++ b/doc/doc-txt/ChangeLog @@ -38,6 +38,9 @@ PP/04 Bugzilla 230: Support TLS-enabled LDAP (in addition to ldaps). NM/04 Fixed exiqgrep to cope with mailq missing size issue Fixes bug 943. +PP/05 Bugzilla 1083: when lookup expansion defers, escape the output which + is logged, to avoid truncation. Patch from John Horne. + Exim version 4.74 ----------------- diff --git a/src/src/expand.c b/src/src/expand.c index 702faabe8..287129c2f 100644 --- a/src/src/expand.c +++ b/src/src/expand.c @@ -3675,8 +3675,8 @@ while (*s != 0) if (search_find_defer) { expand_string_message = - string_sprintf("lookup of \"%s\" gave DEFER: %s", key, - search_error_message); + string_sprintf("lookup of \"%s\" gave DEFER: %s", + string_printing2(key, FALSE), search_error_message); goto EXPAND_FAILED; } if (expand_setup > 0) expand_nmax = expand_setup; |