[exim-cvs] Increase limit on SMTP confirmation message copy …

Commit:     b980ed83fa4ae95ee650ccf73d33dbad4c20c595
Parent:     1708162e6ba66736dc0bb03b2d66b0201f970571
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu Feb 26 19:58:13 2015 +0000
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu Feb 26 19:58:13 2015 +0000

    Increase limit on SMTP confirmation message copy size.  Bug 1572
---
 doc/doc-txt/ChangeLog |    3 +++
 src/src/deliver.c     |    5 +++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index b027a66..55af318 100644
--- 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 ec13ca4..ad871c5 100644
--- 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];