Escape lookup deferral error message when logging.
authorPhil Pennock <pdp@exim.org>
Sun, 13 Feb 2011 02:49:36 +0000 (21:49 -0500)
committerPhil Pennock <pdp@exim.org>
Sun, 13 Feb 2011 02:49:36 +0000 (21:49 -0500)
closes bug 1083

Patch from John Horne.

doc/doc-txt/ChangeLog
src/src/expand.c

index 135213b..5d636a7 100644 (file)
@@ -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
 -----------------
index 702faab..287129c 100644 (file)
@@ -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;