From: Heiko Schlittermann (HS12-RIPE) Date: Sat, 3 Apr 2021 08:54:22 +0000 (+0200) Subject: deliver X-Git-Tag: exim-4.95-RC0~14^2~13 X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=951b668a191ef510a4e27d8204c5fa82ca957a07;p=user%2Fhenk%2Fcode%2Fexim.git deliver (cherry picked from commit 2bafe3fc82cf62f0c21f939f5891b8d067f3abc7) --- diff --git a/src/src/deliver.c b/src/src/deliver.c index a6f68825c..b5530bcf7 100644 --- 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 0cf96cfdc..aa9fc2b48 100644 --- 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 0cf96cfdc..aa9fc2b48 100644 --- 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