Escape lookup deferral error message when logging.

closes bug 1083

Patch from John Horne.

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 135213b2d2f9deac8417d7f571121ca9281962dd..5d636a74d7acdc11012f59e418a17232ca316e62 100644 (file)
--- 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.
 
 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
 -----------------
 
 Exim version 4.74
 -----------------

diff --git a/src/src/expand.c b/src/src/expand.c
index 702faabe82dc515eba4d593b019ddd1f056e7423..287129c2f99d8209c434d74745e540cf42bccdff 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -3675,8 +3675,8 @@ while (*s != 0)
         if (search_find_defer)
           {
           expand_string_message =
         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;
           goto EXPAND_FAILED;
           }
         if (expand_setup > 0) expand_nmax = expand_setup;