From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 26 May 2014 15:26:58 +0000 (+0100)
Subject: Increase limit of smtp_confirmation logging from 100 to 256 chars.  Bug 1408
X-Git-Tag: exim-4_83_RC1~1
X-Git-Url: https://git.exim.org/exim.git/commitdiff_plain/27520a688253e1f73c6f59b32312cdf2755aed2c

Increase limit of smtp_confirmation logging from 100 to 256 chars.  Bug 1408
---

diff --git a/src/src/deliver.c b/src/src/deliver.c
index 70f6a7a21..3f5800ded 100644
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -842,17 +842,17 @@ else
 
 /* confirmation message (SMTP (host_used) and LMTP (driver_name)) */
 
-if ((log_extra_selector & LX_smtp_confirmation) != 0 &&
-    addr->message != NULL &&
-    ((addr->host_used != NULL) || (Ustrcmp(addr->transport->driver_name, "lmtp") == 0)))
+if (log_extra_selector & LX_smtp_confirmation &&
+    addr->message &&
+    (addr->host_used || Ustrcmp(addr->transport->driver_name, "lmtp") == 0))
   {
   int i;
   uschar *p = big_buffer;
   uschar *ss = addr->message;
   *p++ = '\"';
-  for (i = 0; i < 100 && ss[i] != 0; i++)
+  for (i = 0; i < 256 && ss[i] != 0; i++)	/* limit logged amount */
     {
-    if (ss[i] == '\"' || ss[i] == '\\') *p++ = '\\';
+    if (ss[i] == '\"' || ss[i] == '\\') *p++ = '\\'; /* quote \ and " */
     *p++ = ss[i];
     }
   *p++ = '\"';