Increase limit on SMTP confirmation message copy size. Bug 1572

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b027a66113c3015cbd1604fd552b4259b31a3fcb..55af3186cc73825c355bdef21e679b9443b77842 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -78,6 +78,9 @@ JH/21 Support for the A6 type of dns record is withdrawn.
 JH/22 Bug 608: The result of a QUIT or not-QUIT toplevel ACL now matters
       rather than the verbs used.
 
+JH/23 Bug 1572: Increase limit on SMTP confirmation message copy size
+      from 255 to 1024 chars.
+
 
 
 Exim version 4.85

diff --git a/src/src/deliver.c b/src/src/deliver.c
index ec13ca40b1b5c4406f2f59d3af0e3c7061c1c228..ad871c575910ba8a55b273370c9dc75ec35c91e4 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -911,11 +911,12 @@ if (log_extra_selector & LX_smtp_confirmation &&
     addr->message &&
     (addr->host_used || Ustrcmp(addr->transport->driver_name, "lmtp") == 0))
   {
-  int i;
+  unsigned i;
+  unsigned lim = MIN(big_buffer_size, 1024);
   uschar *p = big_buffer;
   uschar *ss = addr->message;
   *p++ = '\"';
-  for (i = 0; i < 256 && ss[i] != 0; i++)      /* limit logged amount */
+  for (i = 0; i < lim && ss[i] != 0; i++)      /* limit logged amount */
     {
     if (ss[i] == '\"' || ss[i] == '\\') *p++ = '\\'; /* quote \ and " */
     *p++ = ss[i];