From b4b07fa8e89e0417499947fa3bd741cf69791b6f Mon Sep 17 00:00:00 2001 From: "Heiko Schlittermann (HS12-RIPE)" Date: Sat, 3 Apr 2021 10:54:22 +0200 Subject: [PATCH 1/1] deliver --- src/src/deliver.c | 5 +++-- test/log/0608 | 2 +- test/paniclog/0608 | 2 +- test/stderr/0608 | 2 +- 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/src/deliver.c b/src/src/deliver.c index 18fd75543..58a273db5 100644 --- a/src/src/deliver.c +++ b/src/src/deliver.c @@ -6143,9 +6143,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/log/0608 b/test/log/0608 index 5331ae48f..d0130a6a9 100644 --- a/test/log/0608 +++ b/test/log/0608 @@ -35,7 +35,7 @@ 2017-07-30 18:51:05.712 10HmaZ-0005vi-00 Completed 2017-07-30 18:51:05.712 10HmbA-0005vi-00 <= CALLER@myhost.test.ex U=CALLER P=local S=sss for f@test.ex 2017-07-30 18:51:05.712 10HmbA-0005vi-00 ** f@test.ex: Unrouteable address -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 10HmbJ-0005vi-00 <= <> R=10HmbA-0005vi-00 U=EXIMUSER P=local S=sss for CALLER@myhost.test.ex 2017-07-30 18:51:05.712 10HmbJ-0005vi-00 => CALLER R=bounces T=savebounce 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 -- 2.30.2