deliver

(cherry picked from commit 2bafe3fc82cf62f0c21f939f5891b8d067f3abc7)

diff --git a/src/src/deliver.c b/src/src/deliver.c
index a6f68825c9238569ab3deac3be91f9def0b72d4b..b5530bcf7e9b18efc9d00686eb571415b1609751 100644 (file)
--- a/src/src/deliver.c
+++ b/src/src/deliver.c
@@ -6165,9 +6165,10 @@ else if (system_filter && process_recipients != RECIP_FAIL_TIMEOUT)
           if (!tmp)
             p->message = string_sprintf("failed to expand \"%s\" as a "
               "system filter transport name", tpname);
-         if (is_tainted2(tmp, 0, m = string_sprintf("Tainted values '%s' "
-              "for transport '%s' as a system filter", tmp, tpname)))
+          { uschar *m;
+         if (m = is_tainted2(tmp, 0, "Tainted values '%s' " "for transport '%s' as a system filter", tmp, tpname))
             p->message = m;
+          }
           tpname = tmp;
           }
         else

diff --git a/test/paniclog/0608 b/test/paniclog/0608
index 0cf96cfdc17432f1565b7e22bffd925422d41820..aa9fc2b4826983b68591f306da9a575c804ad87f 100644 (file)
--- a/test/paniclog/0608
+++ b/test/paniclog/0608
@@ -3,6 +3,6 @@
 
 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset'
 
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex'
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 Tainted bounce_message_file after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex'
 
 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory

diff --git a/test/stderr/0608 b/test/stderr/0608
index 0cf96cfdc17432f1565b7e22bffd925422d41820..aa9fc2b4826983b68591f306da9a575c804ad87f 100644 (file)
--- a/test/stderr/0608
+++ b/test/stderr/0608
@@ -3,6 +3,6 @@
 
 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Failed to expand bounce_message_file: '$acl_m_unset'
 
-2017-07-30 18:51:05.712 10HmbA-0005vi-00 bounce_message_file is not untainted after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex'
+2017-07-30 18:51:05.712 10HmbA-0005vi-00 Tainted bounce_message_file after expansion: 'TESTSUITE/aux-fixed/0608.CALLER@myhost.test.ex'
 
 2017-07-30 18:51:05.712 10HmbB-0005vi-00 Failed to open TESTSUITE/aux-fixed/0608.nonexist.tmpl for warning message texts: No such file or directory