[exim-cvs] Testsuite: fix munge around tpt connect time

Συντάκτης: Exim Git Commits Mailing List
Ημερομηνία:
Προς: exim-cvs
Αντικείμενο: [exim-cvs] Testsuite: fix munge around tpt connect time

Gitweb: https://git.exim.org/exim.git/commitdiff/0ed616733949ce8975d2ff8f183ecdf5291a944d

Commit:     0ed616733949ce8975d2ff8f183ecdf5291a944d
Parent:     8748cff12e22ba27f9b52c87865e5d5a1340ec9e
Author:     Jeremy Harris <jgh146exb@???>
AuthorDate: Thu May 9 18:15:11 2024 +0100
Committer:  Jeremy Harris <jgh146exb@???>
CommitDate: Thu May 9 20:10:42 2024 +0100

    Testsuite: fix munge around tpt connect time
    
    Broken-by: 1d2868b2d90c
---
 test/runtest     |   16 +-
 test/stderr/0143 |    2 +-
 test/stderr/0218 |    8 +-
 test/stderr/0332 |    2 +-
 test/stderr/0333 |    2 +-
 test/stderr/0357 |    6 +-
 test/stderr/0358 |    4 +-
 test/stderr/0374 |    6 +-
 test/stderr/0375 |   14 +-
 test/stderr/0376 |   40 +-
 test/stderr/0388 |    4 +-
 test/stderr/0398 |    2 +-
 test/stderr/0426 |    2 +-
 test/stderr/0432 |    6 +-
 test/stderr/0450 |    4 +-
 test/stderr/0462 |    6 +-
 test/stderr/0473 |    4 +-
 test/stderr/0476 |    4 +-
 test/stderr/0512 |   12 +-
 test/stderr/0543 |    2 +-
 test/stderr/0554 |    4 +-
 test/stderr/0578 |   40 +-
 test/stderr/1157 |    6 +-
 test/stderr/2035 |    5 +-
 test/stderr/2135 |    2 +-
 test/stderr/4052 |    2 +-
 test/stderr/4510 |    2 +-
 test/stderr/4530 |    2 +-
 test/stderr/5403 |    2 +-
 test/stderr/5410 |    6 +-
 test/stderr/5420 | 1314 +++++++++++++++++++++++++++---------------------------
 test/stderr/5820 |   16 +-
 test/stderr/5840 |    2 +-
 33 files changed, 779 insertions(+), 770 deletions(-)

diff --git a/test/runtest b/test/runtest
index dac4ed878..a163a7145 100755
--- a/test/runtest
+++ b/test/runtest
@@ -1486,17 +1486,19 @@ RESET_AFTER_EXTRA_LINE_READ:
     next if /^DKIM \[[^[]+\] (Header hash|b) computed:/;
 
     # Not all platforms support TCP Fast Open, and the compile omits the check
-    if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$//)
-      {
-      chomp;
-      $_ .= <IN>;
-      s/ \.\.\. >>> / ... /;
+    next if /\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$/ ;
+
+#    if (s/\S+ in hosts_try_fastopen\? (no \(option unset\)|no \(end of list\)|yes \(matched "\*"\))\n$//)
+#      {
+#      chomp;
+#      $_ .= <IN>;
+#      s/ \.\.\. >>> / ... /;
       if (s/ non-TFO mode connection attempt to 224.0.0.0, 0 data\b$//) { chomp; $_ .= <IN>; }
       s/Address family not supported by protocol family/Network Error/;
       s/Network(?: is)? unreachable/Network Error/;
-      }
+#      }
     next if /^(ppppp |\d+ )?setsockopt FASTOPEN: Protocol not available$/;
-    s/^( sending) \d+ (nonTFO early-data)$/$1 dd $2/;
+    s/^(sending) \d+ (nonTFO early-data)$/$1 dd $2/;
 
     if (/^([0-9: ]*                        # possible timestamp
     Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.
diff --git a/test/stderr/0143 b/test/stderr/0143
index aa16ca854..f8636e869 100644
--- a/test/stderr/0143
+++ b/test/stderr/0143
@@ -23,7 +23,7 @@ checking retry status of 127.0.0.1
 127.0.0.1 [127.0.0.1]:1111/ip4.ip4.ip4.ip4 retry-status = usable
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ...
- connected
+connected
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes
diff --git a/test/stderr/0218 b/test/stderr/0218
index c7d80f864..523585d5b 100644
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -27,7 +27,7 @@ CALLER@??? in senders? no (end of list)
 R: client  (ACL)
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -109,7 +109,7 @@ CALLER@??? in senders? no (end of list)
 R: client  (ACL)
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
@@ -143,7 +143,7 @@ CALLER@??? in senders? no (end of list)
 R: client  (ACL)
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
-  failed: Connection refused
+ failed: Connection refused
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN
@@ -185,7 +185,7 @@ CALLER@??? in senders? no (end of list)
 R: client  (ACL)
 T: send_to_server  (ACL)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK
diff --git a/test/stderr/0332 b/test/stderr/0332
index c69ae4a60..8cff3bd21 100644
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -33,7 +33,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-t1.lockfile
+locking TESTSUITE/spool/db/wait-t1.lockfile
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
diff --git a/test/stderr/0333 b/test/stderr/0333
index b878ee24e..0ddd349a3 100644
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -31,7 +31,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-t1.lockfile
+locking TESTSUITE/spool/db/wait-t1.lockfile
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => ok@??? R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
diff --git a/test/stderr/0357 b/test/stderr/0357
index 54522c7b1..0e16a6e37 100644
--- a/test/stderr/0357
+++ b/test/stderr/0357
@@ -25,7 +25,7 @@ After routing:
 checking retry status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
- added retry item for R:userx@???:<jgh@???>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   added retry item
@@ -70,7 +70,7 @@ checking retry status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
- added retry item for R:userx@???:<jgh@???>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   existing delete item dropped
@@ -128,7 +128,7 @@ checking retry status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
- added retry item for R:userx@???:<jgh@???>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@???:<CALLER@???> from subprocess
   existing delete item dropped
diff --git a/test/stderr/0358 b/test/stderr/0358
index 1dc42006c..8dbb1f66f 100644
--- a/test/stderr/0358
+++ b/test/stderr/0358
@@ -30,7 +30,7 @@ After routing:
 checking retry status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available
- added retry item for R:userx@???:<jgh@???>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT+:250'
 reading retry information for R:userx@???:<CALLER@???> from subprocess
@@ -94,7 +94,7 @@ checking retry status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record
- added retry item for R:userx@???:<jgh@???>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 added retry item for R:usery@???:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:RCPT:451:QUIT+:250'
 reading retry information for R:userx@???:<CALLER@???> from subprocess
diff --git a/test/stderr/0374 b/test/stderr/0374
index 80275c53f..cc77313d0 100644
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -384,16 +384,16 @@ transport error EPIPE ignored
 LOG: MAIN
   == c1@??? R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-ut4.lockfile
+locking TESTSUITE/spool/db/wait-ut4.lockfile
 cmdlog: '220'
 LOG: MAIN
   => d1@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 locking TESTSUITE/spool/db/retry.lockfile
- cmdlog: '220'
+cmdlog: '220'
 LOG: MAIN
   == d2@??? R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@???>: 450 soft error
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-ut4.lockfile
+locking TESTSUITE/spool/db/wait-ut4.lockfile
 cmdlog: '220'
 LOG: MAIN
   ** d3@??? R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
diff --git a/test/stderr/0375 b/test/stderr/0375
index ca090a914..c118cb04d 100644
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -877,41 +877,41 @@ LOG: MAIN
   == c1@??? R=ut3 T=ut3 defer (0): Child process of ut3 transport returned 127 (could mean unable to exec or command does not exist) from command: /non/existent/file
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-ut4.lockfile
+locking TESTSUITE/spool/db/wait-ut4.lockfile
 cmdlog: '220'
 LOG: MAIN
   => d1@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
- cmdlog: '220'
+cmdlog: '220'
 LOG: MAIN
   == d2@??? R=ut4 T=ut4 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d2@???>: 450 soft error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-ut4.lockfile
+locking TESTSUITE/spool/db/wait-ut4.lockfile
 cmdlog: '220'
 LOG: MAIN
   ** d3@??? P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@???>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-ut5.lockfile
+locking TESTSUITE/spool/db/wait-ut5.lockfile
 cmdlog: '220'
 LOG: MAIN
   ** e1@??? P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@???>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-ut6.lockfile
+locking TESTSUITE/spool/db/wait-ut6.lockfile
 cmdlog: '220'
 LOG: MAIN
   => f1@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1] C="250 OK"
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
- cmdlog: '220'
+cmdlog: '220'
 LOG: MAIN
   == f2@??? R=ut6 T=ut6 defer (-44) H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f2@???>: 450 soft error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-ut6.lockfile
+locking TESTSUITE/spool/db/wait-ut6.lockfile
 cmdlog: '220'
 LOG: MAIN
   ** f3@??? P=<CALLER@???> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@???>: 550 hard error
diff --git a/test/stderr/0376 b/test/stderr/0376
index 9d44a1377..e781a5b0f 100644
--- a/test/stderr/0376
+++ b/test/stderr/0376
@@ -14,7 +14,7 @@ callout cache: no domain record found for localhost
 callout cache: no address record found for ok@localhost
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -82,7 +82,7 @@ callout cache: found domain record for localhost
 callout cache: address record expired for ok@localhost
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
-  failed: Connection refused
+ failed: Connection refused
 LOG: MAIN REJECT
   H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
 created log directory TESTSUITE/spool/log
@@ -107,7 +107,7 @@ callout cache: found domain record for localhost
 callout cache: no address record found for bad@localhost
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -167,7 +167,7 @@ callout cache: found domain record for localhost
 callout cache: address record expired for ok@localhost
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -224,7 +224,7 @@ callout cache: no domain record found for otherhost
 callout cache: no address record found for ok@otherhost
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -292,7 +292,7 @@ callout cache: no domain record found for otherhost2
 callout cache: no address record found for ok@otherhost2
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -369,7 +369,7 @@ callout cache: no domain record found for otherhost3
 callout cache: no address record found for ok@otherhost3
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -440,7 +440,7 @@ callout cache: no domain record found for otherhost4
 callout cache: no address record found for ok@otherhost4
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -510,7 +510,7 @@ callout cache: no domain record found for otherhost41
 callout cache: no address record found for ok@otherhost41
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -591,7 +591,7 @@ callout cache: no domain record found for otherhost21
 callout cache: no address record found for ok@otherhost21
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -641,7 +641,7 @@ callout cache: domain accepts RCPT TO:<postmaster@domain>
 callout cache: no address record found for ok2@otherhost21
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -684,7 +684,7 @@ callout cache: no domain record found for otherhost31
 callout cache: no address record found for ok@otherhost31
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -733,7 +733,7 @@ callout cache: domain rejects random addresses
 callout cache: no address record found for okok@otherhost31
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -775,7 +775,7 @@ callout cache: domain record expired for otherhost31
 callout cache: no address record found for okokok@otherhost31
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -825,7 +825,7 @@ callout cache: no domain record found for otherhost51
 callout cache: no address record found for okok@otherhost51
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -866,7 +866,7 @@ callout cache: no domain record found for otherhost52
 callout cache: no address record found for okokok@otherhost52
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -920,7 +920,7 @@ callout cache: no domain record found for x.y.z
 callout cache: no address record found for abcd@???/<somesender@???>
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -968,7 +968,7 @@ callout cache: found domain record for x.y.z
 callout cache: no address record found for abcd@???
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -1008,7 +1008,7 @@ callout cache: no domain record found for otherhost9
 callout cache: no address record found for ok@otherhost9
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
@@ -1060,7 +1060,7 @@ callout cache: no domain record found for test.ex
 callout cache: no address record found for z@???/<postmaster@???>
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK
diff --git a/test/stderr/0388 b/test/stderr/0388
index c62492e6a..3422fe1ea 100644
--- a/test/stderr/0388
+++ b/test/stderr/0388
@@ -88,7 +88,7 @@ set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  127.0.0.1 in hosts_try_fastopen?
   list element: 
- connected
+connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
@@ -130,7 +130,7 @@ V4NET.0.0.0 in serialize_hosts? no (option unset)
 set_process_info: pppp delivering 10HmaX-000000005vi-0000 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y)
 Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ...
  V4NET.0.0.0 in hosts_try_fastopen?
-  failed: Network Error
+ failed: Network Error
 LOG: MAIN
   H=V4NET.0.0.0 [V4NET.0.0.0] Network Error
 set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER
diff --git a/test/stderr/0398 b/test/stderr/0398
index f2ae6fef9..9fcec221e 100644
--- a/test/stderr/0398
+++ b/test/stderr/0398
@@ -153,7 +153,7 @@ interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  127.0.0.1 in hosts_try_fastopen?
   list element: 
- connected
+connected
   SMTP<< 220 Server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO mail.test.ex
diff --git a/test/stderr/0426 b/test/stderr/0426
index 197cdbc6e..8ae6452da 100644
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -52,7 +52,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-t1.lockfile
+locking TESTSUITE/spool/db/wait-t1.lockfile
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250'
 LOG: MAIN
   ** x@??? R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@???>: 550 Unknown
diff --git a/test/stderr/0432 b/test/stderr/0432
index 885781e1c..a4f3433d7 100644
--- a/test/stderr/0432
+++ b/test/stderr/0432
@@ -106,7 +106,7 @@ interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
  127.0.0.1 in hosts_try_fastopen?
   list element: 
- connected
+connected
   SMTP<< 220 server ready
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
@@ -297,7 +297,7 @@ MUNGED: ::1 will be omitted in what follows

>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
>>> 127.0.0.1 in hosts_try_fastopen?
>>> list element:
->>> >>> connected
+>>> connected
>>> SMTP<< 220 server ready
>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
>>> SMTP>> EHLO myhost.test.ex
@@ -351,7 +351,7 @@ MUNGED: ::1 will be omitted in what follows
>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
>>> 127.0.0.1 in hosts_try_fastopen?
>>> list element:
->>> >>> connected
+>>> connected
>>> SMTP<< 220 server ready
>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
>>> SMTP>> EHLO myhost.test.ex
diff --git a/test/stderr/0450 b/test/stderr/0450
index 19be3ace9..979b30d45 100644
--- a/test/stderr/0450
+++ b/test/stderr/0450
@@ -19,7 +19,7 @@ checking retry status of 127.0.0.1
127.0.0.1 [127.0.0.1]:1111 retry-status = usable
delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_D: errno=dd more_errno=dd,A flags=2
@@ -49,7 +49,7 @@ no message retry record
127.0.0.1 [127.0.0.1]:1112 retry-status = usable
delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D2 ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_D2: errno=dd more_errno=dd,A flags=2
diff --git a/test/stderr/0462 b/test/stderr/0462
index d7423c737..f1f6d8fd3 100644
--- a/test/stderr/0462
+++ b/test/stderr/0462
@@ -14,7 +14,7 @@ callout cache: no domain record found for localhost
callout cache: no address record found for Ok@localhost
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -68,7 +68,7 @@ callout cache: no domain record found for elsewhere
callout cache: no address record found for NOTok@elsewhere
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
@@ -106,7 +106,7 @@ callout cache: found domain record for elsewhere
callout cache: no address record found for NOTok2@elsewhere
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250 OK
diff --git a/test/stderr/0473 b/test/stderr/0473
index 1c92bcef2..e3e8f01ef 100644
--- a/test/stderr/0473
+++ b/test/stderr/0473
@@ -14,7 +14,7 @@ callout cache: found domain record for two.test.ex
callout cache: no address record found for r11@???
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO the.local.host.name
SMTP<< 250 OK
@@ -48,7 +48,7 @@ callout cache: found domain record for two.test.ex
callout cache: no address record found for r11@???
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP(Connection timed out)<<
SMTP(close)>>
cmdlog: '(unset)'
diff --git a/test/stderr/0476 b/test/stderr/0476
index 038e25078..61227a388 100644
--- a/test/stderr/0476
+++ b/test/stderr/0476
@@ -19,7 +19,7 @@ checking retry status of 127.0.0.1
delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO the.local.host.name
cmd buf flush ddd bytes
@@ -87,7 +87,7 @@ checking retry status of 127.0.0.1
delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (CALLER@???)
set_process_info: pppp delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@???)
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
set_process_info: pppp delivering 10HmaZ-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for CALLER@???: result DEFER
diff --git a/test/stderr/0512 b/test/stderr/0512
index 7c0285ce1..98f21d1bd 100644
--- a/test/stderr/0512
+++ b/test/stderr/0512
@@ -18,7 +18,7 @@ no message retry record
delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2
@@ -31,7 +31,7 @@ no message retry record
delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2
@@ -44,7 +44,7 @@ no message retry record
delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2
@@ -57,7 +57,7 @@ no message retry record
delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2
@@ -115,7 +115,7 @@ no message retry record
delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2
@@ -128,7 +128,7 @@ no message retry record
delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@???)
hosts_max_try limit reached with this host
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN
H=127.0.0.1 [127.0.0.1] Connection refused
added retry item for T:[127.0.0.1]:127.0.0.1:PORT_S: errno=dd more_errno=dd,A flags=2
diff --git a/test/stderr/0543 b/test/stderr/0543
index 9cfdba77e..5df9df63b 100644
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -32,7 +32,7 @@ After routing:
Failed addresses:
Deferred addresses:
locking TESTSUITE/spool/db/retry.lockfile
- locking /home/jgh/local_git/exim/test/spool/db/wait-smtp.lockfile
+locking TESTSUITE/spool/db/wait-smtp.lockfile
cmdlog: '220:EHLO:250-:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'
LOG: MAIN
=> userx@domain1 R=smarthost T=smtp H=thisloop.test.ex [127.0.0.1] C="250 OK"
diff --git a/test/stderr/0554 b/test/stderr/0554
index 8d77c745e..4e6690afb 100644
--- a/test/stderr/0554
+++ b/test/stderr/0554
@@ -18,7 +18,7 @@ After routing:
checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no retry data available
- added retry item for R:x@y:<jgh@???>: errno=-44 more_errno=51,A flags=0
+added retry item for R:x@y:<CALLER@???>: errno=-44 more_errno=dd,A flags=0
cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
reading retry information for R:x@y:<CALLER@???> from subprocess
added retry item
@@ -60,7 +60,7 @@ checking retry status of 127.0.0.1
locking TESTSUITE/spool/db/retry.lockfile
no host retry record
no message retry record
- added retry item for R:x@y:<jgh@???>: errno=0 more_errno=0,A flags=1
+added retry item for R:x@y:<CALLER@???>: errno=dd more_errno=dd,A flags=1
added retry item for R:x@y: errno=dd more_errno=dd,A flags=1
locking TESTSUITE/spool/db/wait-smtp.lockfile
cmdlog: '220:EHLO:250:MAIL:250:RCPT:250:DATA:354:.:250:QUIT+:250'
diff --git a/test/stderr/0578 b/test/stderr/0578
index 45d558ef9..6e746438a 100644
--- a/test/stderr/0578
+++ b/test/stderr/0578
@@ -14,7 +14,7 @@ callout cache: no domain record found for localhost
callout cache: no address record found for ok@localhost
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -84,7 +84,7 @@ callout cache: found domain record for localhost
callout cache: address record expired for ok@localhost
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- failed: Connection refused
+ failed: Connection refused
LOG: MAIN REJECT
H=(test) [V4NET.0.0.1] U=root sender verify defer for <ok@localhost>: Could not complete sender verify callout: 127.0.0.1 [127.0.0.1] : Connection refused
created log directory TESTSUITE/spool/log
@@ -109,7 +109,7 @@ callout cache: found domain record for localhost
callout cache: no address record found for bad@localhost
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -171,7 +171,7 @@ callout cache: found domain record for localhost
callout cache: address record expired for ok@localhost
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -232,7 +232,7 @@ callout cache: no domain record found for otherhost
callout cache: no address record found for ok@otherhost
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -302,7 +302,7 @@ callout cache: no domain record found for otherhost2
callout cache: no address record found for ok@otherhost2
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -381,7 +381,7 @@ callout cache: no domain record found for otherhost3
callout cache: no address record found for ok@otherhost3
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -454,7 +454,7 @@ callout cache: no domain record found for otherhost4
callout cache: no address record found for ok@otherhost4
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -526,7 +526,7 @@ callout cache: no domain record found for otherhost41
callout cache: no address record found for ok@otherhost41
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -609,7 +609,7 @@ callout cache: no domain record found for otherhost21
callout cache: no address record found for ok@otherhost21
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -661,7 +661,7 @@ callout cache: domain accepts RCPT TO:<postmaster@domain>
callout cache: no address record found for ok2@otherhost21
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -706,7 +706,7 @@ callout cache: no domain record found for otherhost31
callout cache: no address record found for ok@otherhost31
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -757,7 +757,7 @@ callout cache: domain rejects random addresses
callout cache: no address record found for okok@otherhost31
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -801,7 +801,7 @@ callout cache: domain record expired for otherhost31
callout cache: no address record found for okokok@otherhost31
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -853,7 +853,7 @@ callout cache: no domain record found for otherhost51
callout cache: no address record found for okok@otherhost51
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -896,7 +896,7 @@ callout cache: no domain record found for otherhost52
callout cache: no address record found for okokok@otherhost52
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -952,7 +952,7 @@ callout cache: no domain record found for x.y.z
callout cache: no address record found for abcd@???/<somesender@???>
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -1002,7 +1002,7 @@ callout cache: found domain record for x.y.z
callout cache: no address record found for abcd@???
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -1044,7 +1044,7 @@ callout cache: no domain record found for otherhost9
callout cache: no address record found for ok@otherhost9
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
@@ -1098,7 +1098,7 @@ callout cache: no domain record found for test.ex
callout cache: no address record found for z@???/<postmaster@???>
interface=NULL port=PORT_S
Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
- connected
+connected
SMTP<< 220 Server ready
SMTP>> EHLO myhost.test.ex
SMTP<< 250-Yeah mate
diff --git a/test/stderr/1157 b/test/stderr/1157
index cec9563c4..7a9ebd556 100644
--- a/test/stderr/1157
+++ b/test/stderr/1157
@@ -8,7 +8,7 @@ LOG: queue_run MAIN
>>>>>>>>>>>>>>>> Exim pid=p1243 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1244 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- connected
+connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
@@ -107,7 +107,7 @@ LOG: queue_run MAIN
>>>>>>>>>>>>>>>> Exim pid=p1250 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1251 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- connected
+connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
@@ -206,7 +206,7 @@ LOG: queue_run MAIN
>>>>>>>>>>>>>>>> Exim pid=p1257 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
>>>>>>>>>>>>>>>> Exim pid=p1258 (qrun-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- connected
+connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
diff --git a/test/stderr/2035 b/test/stderr/2035
index 66f4d48b6..dc1953094 100644
--- a/test/stderr/2035
+++ b/test/stderr/2035
@@ -3,7 +3,9 @@ configuration file is TESTSUITE/test-config
admin user
LOG: smtp_connection MAIN
SMTP connection from CALLER
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ... connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
+ TFO mode sendto, no data: EINPROGRESS
+connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
@@ -17,6 +19,7 @@ cmd buf flush ddd bytes
SMTP>> STARTTLS
cmd buf flush ddd bytes
SMTP<< 220 TLS go ahead
+127.0.0.1 in tls_verify_cert_hostnames? no (end of list)
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
SMTP<< 250-myhost.test.ex Hello localhost [127.0.0.1]
diff --git a/test/stderr/2135 b/test/stderr/2135
index 220d48670..98817e639 100644
--- a/test/stderr/2135
+++ b/test/stderr/2135
@@ -4,7 +4,7 @@ admin user
LOG: smtp_connection MAIN
SMTP connection from CALLER
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- connected
+connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
diff --git a/test/stderr/4052 b/test/stderr/4052
index 03065db8d..0cbbd2033 100644
--- a/test/stderr/4052
+++ b/test/stderr/4052
@@ -30,7 +30,7 @@ not using DSN
SMTP>> DATA
cmd buf flush ddd bytes
Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
- sending dd nonTFO early-data
+sending dd nonTFO early-data
connected
smtp_reap_early_pipe expect banner
SMTP<< 220 banner
diff --git a/test/stderr/4510 b/test/stderr/4510
index ff04e9c97..0ce5029a9 100644
--- a/test/stderr/4510
+++ b/test/stderr/4510
@@ -9,7 +9,7 @@ trusted user
admin user
dropping to exim gid; retaining priv uid
Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ...
- connected
+connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
diff --git a/test/stderr/4530 b/test/stderr/4530
index fa38719fd..30d93160e 100644
--- a/test/stderr/4530
+++ b/test/stderr/4530
@@ -9,7 +9,7 @@ trusted user
admin user
dropping to exim gid; retaining priv uid
Connecting to ip4.ip4.ip4.ip4 [ip4.ip4.ip4.ip4]:PORT_D ...
- connected
+connected
SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
SMTP>> EHLO myhost.test.ex
cmd buf flush ddd bytes
diff --git a/test/stderr/5403 b/test/stderr/5403
index eafc41309..b173280d1 100644
--- a/test/stderr/5403
+++ b/test/stderr/5403
@@ -101,7 +101,7 @@ MUNGED: ::1 will be omitted in what follows
>>> Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ...
>>> 127.0.0.1 in hosts_try_fastopen?
>>> list element:
->>> >>> connected
+>>> connected
>>> SMTP<< 220 server ready
>>> 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
>>> SMTP>> EHLO myhost.test.ex

diff --git a/test/stderr/5410 b/test/stderr/5410
index fda622012..43903aa79 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -129,7 +129,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?
   list element: 
- connected
+connected
 try option helo_data
  ╭considering: $primary_hostname
  ├──────value: myhost.test.ex
@@ -788,7 +788,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?
   list element: 
- connected
+connected
 try option helo_data
  ╭considering: $primary_hostname
  ├──────value: myhost.test.ex
@@ -1397,7 +1397,7 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
 try option dscp
  127.0.0.1 in hosts_try_fastopen?
   list element: 
- connected
+connected
 try option helo_data
  ╭considering: $primary_hostname
  ├──────value: myhost.test.ex
diff --git a/test/stderr/5420 b/test/stderr/5420
index 3ee112b8c..b2b979297 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -72,15 +72,15 @@ using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
-domain.com in "! +local_domains"?
- list element: ! +local_domains
+domain.com in domains?
+ list element: !░+local_domains
   start sublist local_domains
    domain.com in "test.ex : *.test.ex"?
    ╎list element: test.ex
    ╎list element: *.test.ex
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
-domain.com in "! +local_domains"? yes (end of list)
+domain.com in domains? yes (end of list)
 try option router_home_directory
 try option set
 processing address_data
@@ -100,15 +100,15 @@ try option unseen
 accept: condition test succeeded in ACL "cutthrough"
 end of ACL "cutthrough": ACCEPT
 ----------- start cutthrough setup ------------
-domain.com in "! +local_domains"?
- list element: ! +local_domains
+domain.com in domains?
+ list element: !░+local_domains
   start sublist local_domains
    domain.com in "test.ex : *.test.ex"?
    ╎list element: test.ex
    ╎list element: *.test.ex
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
-domain.com in "! +local_domains"? yes (end of list)
+domain.com in domains? yes (end of list)
 try option router_home_directory
 try option set
 processing address_data
@@ -125,10 +125,11 @@ try option transport
 try option unseen
 try option unseen
 try option interface
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp
-127.0.0.1 in hosts_try_fastopen?
- list element: 
- connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
+try option dscp
+ 127.0.0.1 in hosts_try_fastopen?
+  list element: 
+connected
 try option helo_data
  ╭considering: $primary_hostname
  ├──────value: myhost.test.ex
@@ -288,354 +289,353 @@ try option message_id_header_text
  ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
 try option received_header_text
  ╭considering: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: Received:░
  ├considering: ${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:sender_rcvhost
  ├─────result: false
   ╭───scanning: from░$sender_rcvhost↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: from░
   ├───scanning: $sender_rcvhost↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: 
   ├───scanning: ↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ↩
-      
+  ␉
   ├───scanning: }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: from░$sender_rcvhost↩
-      
+  ␉
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
   ╭considering: ${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: from░
    ├considering: ${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ╎╭considering: $sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-   ╎    }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-   ╎    }}(Exim░$version_number)↩
-   ╎    ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-   ╎    }}id░$message_exim_id${if░def:received_for░{↩
-   ╎    for░$received_for}}
+   ╎␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ╎␉}}(Exim░$version_number)↩
+   ╎␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ╎␉}}id░$message_exim_id${if░def:received_for░{↩
+   ╎␉for░$received_for}}
    ╎├──────value: CALLER
    ╎├considering: }░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-   ╎    }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-   ╎    }}(Exim░$version_number)↩
-   ╎    ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-   ╎    }}id░$message_exim_id${if░def:received_for░{↩
-   ╎    for░$received_for}}
+   ╎␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ╎␉}}(Exim░$version_number)↩
+   ╎␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ╎␉}}id░$message_exim_id${if░def:received_for░{↩
+   ╎␉for░$received_for}}
    ╎├───expanded: $sender_ident
    ╎╰─────result: CALLER
    ├─────op-res: CALLER
    ├considering: ░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: ░
    ├considering: }}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───expanded: from░${quote_local_part:$sender_ident}░
    ╰─────result: from░CALLER░
   ├───item-res: from░CALLER░
   ├considering: ${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: (helo=
    ├considering: $sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├──────value: myhost.test.ex
               ╰──(tainted)
    ├considering: )↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: )↩
-       
+   ␉
    ├considering: }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───expanded: (helo=$sender_helo_name)↩
-       
+   ␉
    ╰─────result: (helo=myhost.test.ex)↩
-       
+   ␉
               ╰──(tainted)
   ├───item-res: (helo=myhost.test.ex)↩
-      
+  ␉
              ╰──(tainted)
   ├considering: }}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}
+  ␉}}
   ╰─────result: from░CALLER░(helo=myhost.test.ex)↩
-      
+  ␉
              ╰──(tainted)
  ├───item-res: from░CALLER░(helo=myhost.test.ex)↩
-     
+ ␉
             ╰──(tainted)
  ├considering: by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: by░
  ├considering: $primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──────value: myhost.test.ex
  ├considering: ░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: ░
  ├considering: ${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:received_protocol
  ├─────result: true
   ╭considering: with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: with░
   ├considering: $received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: local-esmtp
   ├considering: ░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ░
   ├considering: }}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: with░$received_protocol░
   ╰─────result: with░local-esmtp░
  ├───item-res: with░local-esmtp░
             ╰──(tainted)
  ├considering: ${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ░($tls_in_ver)
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning: ░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ░tls░
   ├───scanning: $tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: 
   ├───scanning: ↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ↩
-      
+  ␉
   ├───scanning: }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ░tls░$tls_in_cipher_std↩
-      
+  ␉
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: (Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: (Exim░
  ├considering: $version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──────value: x.yz
  ├considering: )↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: )↩
-     
+ ␉
  ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:sender_address
  ├─────result: true
   ╭considering: (envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: (envelope-from░<
   ├considering: $sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: CALLER@???
   ├considering: >)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: >)↩
-      
+  ␉
   ├considering: }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉for░$received_for}}
   ├───expanded: (envelope-from░<$sender_address>)↩
-      
+  ␉
   ╰─────result: (envelope-from░<CALLER@???>)↩
-      
+  ␉
  ├───item-res: (envelope-from░<CALLER@???>)↩
-     
+ ␉
             ╰──(tainted)
  ├considering: id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├───────text: id░
  ├considering: $message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├──────value: 10HmaX-000000005vi-0000
  ├considering: ${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩
-      for░$received_for}}
+  ␉for░$received_for}}
   ├───────text: ↩
-      for░
+  ␉for░
   ├considering: $received_for}}
   ├──────value: userx@???
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩
-      for░$received_for
+  ␉for░$received_for
   ╰─────result: ↩
-      for░userx@???
+  ␉for░userx@???
              ╰──(tainted)
  ├───item-res: ↩
-     for░userx@???
+ ␉for░userx@???
             ╰──(tainted)
  ├───expanded: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ╰─────result: Received:░from░CALLER░(helo=myhost.test.ex)↩
-     by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
-     (envelope-from░<CALLER@???>)↩
-     id░10HmaX-000000005vi-0000↩
-     for░userx@???
+ ␉by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
+ ␉(envelope-from░<CALLER@???>)↩
+ ␉id░10HmaX-000000005vi-0000↩
+ ␉for░userx@???
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 try option acl_smtp_dkim
-try option acl_smtp_mime
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
@@ -731,15 +731,15 @@ using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
-domain.com in "! +local_domains"?
- list element: ! +local_domains
+domain.com in domains?
+ list element: !░+local_domains
   start sublist local_domains
    domain.com in "test.ex : *.test.ex"?
    ╎list element: test.ex
    ╎list element: *.test.ex
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
-domain.com in "! +local_domains"? yes (end of list)
+domain.com in domains? yes (end of list)
 try option router_home_directory
 try option set
 processing address_data
@@ -759,15 +759,15 @@ try option unseen
 accept: condition test succeeded in ACL "cutthrough"
 end of ACL "cutthrough": ACCEPT
 ----------- start cutthrough setup ------------
-domain.com in "! +local_domains"?
- list element: ! +local_domains
+domain.com in domains?
+ list element: !░+local_domains
   start sublist local_domains
    domain.com in "test.ex : *.test.ex"?
    ╎list element: test.ex
    ╎list element: *.test.ex
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
-domain.com in "! +local_domains"? yes (end of list)
+domain.com in domains? yes (end of list)
 try option router_home_directory
 try option set
 processing address_data
@@ -784,10 +784,11 @@ try option transport
 try option unseen
 try option unseen
 try option interface
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp
-127.0.0.1 in hosts_try_fastopen?
- list element: 
- connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
+try option dscp
+ 127.0.0.1 in hosts_try_fastopen?
+  list element: 
+connected
 try option helo_data
  ╭considering: $primary_hostname
  ├──────value: myhost.test.ex
@@ -897,354 +898,353 @@ try option message_id_header_text
  ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
 try option received_header_text
  ╭considering: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: Received:░
  ├considering: ${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:sender_rcvhost
  ├─────result: false
   ╭───scanning: from░$sender_rcvhost↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: from░
   ├───scanning: $sender_rcvhost↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: 
   ├───scanning: ↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ↩
-      
+  ␉
   ├───scanning: }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: from░$sender_rcvhost↩
-      
+  ␉
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
   ╭considering: ${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: from░
    ├considering: ${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ╎╭considering: $sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-   ╎    }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-   ╎    }}(Exim░$version_number)↩
-   ╎    ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-   ╎    }}id░$message_exim_id${if░def:received_for░{↩
-   ╎    for░$received_for}}
+   ╎␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ╎␉}}(Exim░$version_number)↩
+   ╎␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ╎␉}}id░$message_exim_id${if░def:received_for░{↩
+   ╎␉for░$received_for}}
    ╎├──────value: CALLER
    ╎├considering: }░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-   ╎    }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-   ╎    }}(Exim░$version_number)↩
-   ╎    ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-   ╎    }}id░$message_exim_id${if░def:received_for░{↩
-   ╎    for░$received_for}}
+   ╎␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ╎␉}}(Exim░$version_number)↩
+   ╎␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ╎␉}}id░$message_exim_id${if░def:received_for░{↩
+   ╎␉for░$received_for}}
    ╎├───expanded: $sender_ident
    ╎╰─────result: CALLER
    ├─────op-res: CALLER
    ├considering: ░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: ░
    ├considering: }}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───expanded: from░${quote_local_part:$sender_ident}░
    ╰─────result: from░CALLER░
   ├───item-res: from░CALLER░
   ├considering: ${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: (helo=
    ├considering: $sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├──────value: myhost.test.ex
               ╰──(tainted)
    ├considering: )↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: )↩
-       
+   ␉
    ├considering: }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───expanded: (helo=$sender_helo_name)↩
-       
+   ␉
    ╰─────result: (helo=myhost.test.ex)↩
-       
+   ␉
               ╰──(tainted)
   ├───item-res: (helo=myhost.test.ex)↩
-      
+  ␉
              ╰──(tainted)
   ├considering: }}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}
+  ␉}}
   ╰─────result: from░CALLER░(helo=myhost.test.ex)↩
-      
+  ␉
              ╰──(tainted)
  ├───item-res: from░CALLER░(helo=myhost.test.ex)↩
-     
+ ␉
             ╰──(tainted)
  ├considering: by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: by░
  ├considering: $primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──────value: myhost.test.ex
  ├considering: ░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: ░
  ├considering: ${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:received_protocol
  ├─────result: true
   ╭considering: with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: with░
   ├considering: $received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: local-esmtp
   ├considering: ░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ░
   ├considering: }}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: with░$received_protocol░
   ╰─────result: with░local-esmtp░
  ├───item-res: with░local-esmtp░
             ╰──(tainted)
  ├considering: ${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ░($tls_in_ver)
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning: ░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ░tls░
   ├───scanning: $tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: 
   ├───scanning: ↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ↩
-      
+  ␉
   ├───scanning: }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ░tls░$tls_in_cipher_std↩
-      
+  ␉
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: (Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: (Exim░
  ├considering: $version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──────value: x.yz
  ├considering: )↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: )↩
-     
+ ␉
  ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:sender_address
  ├─────result: true
   ╭considering: (envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: (envelope-from░<
   ├considering: $sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: CALLER@???
   ├considering: >)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: >)↩
-      
+  ␉
   ├considering: }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉for░$received_for}}
   ├───expanded: (envelope-from░<$sender_address>)↩
-      
+  ␉
   ╰─────result: (envelope-from░<CALLER@???>)↩
-      
+  ␉
  ├───item-res: (envelope-from░<CALLER@???>)↩
-     
+ ␉
             ╰──(tainted)
  ├considering: id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├───────text: id░
  ├considering: $message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├──────value: 10HmaZ-000000005vi-0000
  ├considering: ${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩
-      for░$received_for}}
+  ␉for░$received_for}}
   ├───────text: ↩
-      for░
+  ␉for░
   ├considering: $received_for}}
   ├──────value: usery@???
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩
-      for░$received_for
+  ␉for░$received_for
   ╰─────result: ↩
-      for░usery@???
+  ␉for░usery@???
              ╰──(tainted)
  ├───item-res: ↩
-     for░usery@???
+ ␉for░usery@???
             ╰──(tainted)
  ├───expanded: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ╰─────result: Received:░from░CALLER░(helo=myhost.test.ex)↩
-     by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
-     (envelope-from░<CALLER@???>)↩
-     id░10HmaZ-000000005vi-0000↩
-     for░usery@???
+ ␉by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
+ ␉(envelope-from░<CALLER@???>)↩
+ ␉id░10HmaZ-000000005vi-0000↩
+ ␉for░usery@???
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 try option acl_smtp_dkim
-try option acl_smtp_mime
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
@@ -1340,15 +1340,15 @@ using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
-domain.com in "! +local_domains"?
- list element: ! +local_domains
+domain.com in domains?
+ list element: !░+local_domains
   start sublist local_domains
    domain.com in "test.ex : *.test.ex"?
    ╎list element: test.ex
    ╎list element: *.test.ex
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
-domain.com in "! +local_domains"? yes (end of list)
+domain.com in domains? yes (end of list)
 try option router_home_directory
 try option set
 processing address_data
@@ -1368,15 +1368,15 @@ try option unseen
 accept: condition test succeeded in ACL "cutthrough"
 end of ACL "cutthrough": ACCEPT
 ----------- start cutthrough setup ------------
-domain.com in "! +local_domains"?
- list element: ! +local_domains
+domain.com in domains?
+ list element: !░+local_domains
   start sublist local_domains
    domain.com in "test.ex : *.test.ex"?
    ╎list element: test.ex
    ╎list element: *.test.ex
    domain.com in "test.ex : *.test.ex"? no (end of list)
   end sublist local_domains
-domain.com in "! +local_domains"? yes (end of list)
+domain.com in domains? yes (end of list)
 try option router_home_directory
 try option set
 processing address_data
@@ -1393,10 +1393,11 @@ try option transport
 try option unseen
 try option unseen
 try option interface
-Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ... try option dscp
-127.0.0.1 in hosts_try_fastopen?
- list element: 
- connected
+Connecting to 127.0.0.1 [127.0.0.1]:PORT_D from ip4.ip4.ip4.ip4 ...
+try option dscp
+ 127.0.0.1 in hosts_try_fastopen?
+  list element: 
+connected
 try option helo_data
  ╭considering: $primary_hostname
  ├──────value: myhost.test.ex
@@ -1506,354 +1507,353 @@ try option message_id_header_text
  ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
 try option received_header_text
  ╭considering: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: Received:░
  ├considering: ${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:sender_rcvhost
  ├─────result: false
   ╭───scanning: from░$sender_rcvhost↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: from░
   ├───scanning: $sender_rcvhost↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: 
   ├───scanning: ↩
-      }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ↩
-      
+  ␉
   ├───scanning: }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: from░$sender_rcvhost↩
-      
+  ␉
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
   ╭considering: ${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──condition: def:sender_ident
   ├─────result: true
    ╭considering: from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: from░
    ├considering: ${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ╎╭considering: $sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-   ╎    }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-   ╎    }}(Exim░$version_number)↩
-   ╎    ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-   ╎    }}id░$message_exim_id${if░def:received_for░{↩
-   ╎    for░$received_for}}
+   ╎␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ╎␉}}(Exim░$version_number)↩
+   ╎␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ╎␉}}id░$message_exim_id${if░def:received_for░{↩
+   ╎␉for░$received_for}}
    ╎├──────value: CALLER
    ╎├considering: }░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-   ╎    }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-   ╎    }}(Exim░$version_number)↩
-   ╎    ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-   ╎    }}id░$message_exim_id${if░def:received_for░{↩
-   ╎    for░$received_for}}
+   ╎␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ╎␉}}(Exim░$version_number)↩
+   ╎␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ╎␉}}id░$message_exim_id${if░def:received_for░{↩
+   ╎␉for░$received_for}}
    ╎├───expanded: $sender_ident
    ╎╰─────result: CALLER
    ├─────op-res: CALLER
    ├considering: ░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: ░
    ├considering: }}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───expanded: from░${quote_local_part:$sender_ident}░
    ╰─────result: from░CALLER░
   ├───item-res: from░CALLER░
   ├considering: ${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──condition: def:sender_helo_name
   ├─────result: true
    ╭considering: (helo=$sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: (helo=
    ├considering: $sender_helo_name)↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├──────value: myhost.test.ex
               ╰──(tainted)
    ├considering: )↩
-       }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───────text: )↩
-       
+   ␉
    ├considering: }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-       }}(Exim░$version_number)↩
-       ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+   ␉}}(Exim░$version_number)↩
+   ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ␉}}id░$message_exim_id${if░def:received_for░{↩
+   ␉for░$received_for}}
    ├───expanded: (helo=$sender_helo_name)↩
-       
+   ␉
    ╰─────result: (helo=myhost.test.ex)↩
-       
+   ␉
               ╰──(tainted)
   ├───item-res: (helo=myhost.test.ex)↩
-      
+  ␉
              ╰──(tainted)
   ├considering: }}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-      }}
+  ␉}}
   ╰─────result: from░CALLER░(helo=myhost.test.ex)↩
-      
+  ␉
              ╰──(tainted)
  ├───item-res: from░CALLER░(helo=myhost.test.ex)↩
-     
+ ␉
             ╰──(tainted)
  ├considering: by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: by░
  ├considering: $primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──────value: myhost.test.ex
  ├considering: ░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: ░
  ├considering: ${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:received_protocol
  ├─────result: true
   ╭considering: with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: with░
   ├considering: $received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: local-esmtp
   ├considering: ░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ░
   ├considering: }}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: with░$received_protocol░
   ╰─────result: with░local-esmtp░
  ├───item-res: with░local-esmtp░
             ╰──(tainted)
  ├considering: ${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ░($tls_in_ver)
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: ${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:tls_in_cipher_std
  ├─────result: false
   ╭───scanning: ░tls░$tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ░tls░
   ├───scanning: $tls_in_cipher_std↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: 
   ├───scanning: ↩
-      }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}(Exim░$version_number)↩
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: ↩
-      
+  ␉
   ├───scanning: }}(Exim░$version_number)↩
-      ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───expanded: ░tls░$tls_in_cipher_std↩
-      
+  ␉
   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: (Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: (Exim░
  ├considering: $version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──────value: x.yz
  ├considering: )↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├───────text: )↩
-     
+ ␉
  ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ├──condition: def:sender_address
  ├─────result: true
   ╭considering: (envelope-from░<$sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: (envelope-from░<
   ├considering: $sender_address>)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├──────value: CALLER@???
   ├considering: >)↩
-      }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}
   ├───────text: >)↩
-      
+  ␉
   ├considering: }}id░$message_exim_id${if░def:received_for░{↩
-      for░$received_for}}
+  ␉for░$received_for}}
   ├───expanded: (envelope-from░<$sender_address>)↩
-      
+  ␉
   ╰─────result: (envelope-from░<CALLER@???>)↩
-      
+  ␉
  ├───item-res: (envelope-from░<CALLER@???>)↩
-     
+ ␉
             ╰──(tainted)
  ├considering: id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├───────text: id░
  ├considering: $message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├──────value: 10HmbB-000000005vi-0000
  ├considering: ${if░def:received_for░{↩
-     for░$received_for}}
+ ␉for░$received_for}}
  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩
-      for░$received_for}}
+  ␉for░$received_for}}
   ├───────text: ↩
-      for░
+  ␉for░
   ├considering: $received_for}}
   ├──────value: usery@???
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩
-      for░$received_for
+  ␉for░$received_for
   ╰─────result: ↩
-      for░usery@???
+  ␉for░usery@???
              ╰──(tainted)
  ├───item-res: ↩
-     for░usery@???
+ ␉for░usery@???
             ╰──(tainted)
  ├───expanded: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
-     }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
-     }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
-     }}(Exim░$version_number)↩
-     ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
-     }}id░$message_exim_id${if░def:received_for░{↩
-     for░$received_for}}
+ ␉}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+ ␉}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ ␉}}(Exim░$version_number)↩
+ ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ ␉}}id░$message_exim_id${if░def:received_for░{↩
+ ␉for░$received_for}}
  ╰─────result: Received:░from░CALLER░(helo=myhost.test.ex)↩
-     by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
-     (envelope-from░<CALLER@???>)↩
-     id░10HmbB-000000005vi-0000↩
-     for░usery@???
+ ␉by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
+ ␉(envelope-from░<CALLER@???>)↩
+ ␉id░10HmbB-000000005vi-0000↩
+ ␉for░usery@???
             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 try option acl_smtp_dkim
-try option acl_smtp_mime
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}
diff --git a/test/stderr/5820 b/test/stderr/5820
index 2dff7ec02..43a5f5dfd 100644
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -18,9 +18,12 @@

>>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
>>> routing rcptuser@???
>>> calling client router
->>> dane256ee.test.ex in "*"?
->>> list element: *
->>> dane256ee.test.ex in "*"? yes (matched "*")
+>>> check dnssec require list
+>>> dane256ee.test.ex in dnssec_require_domains? no (option unset)
+>>> check dnssec request list
+>>> dane256ee.test.ex in dnssec_request_domains?
+>>> list element: *
+>>> dane256ee.test.ex in dnssec_request_domains? yes (matched "*")
>>> local host found for non-MX address
>>> routed by client router
>>> Attempting full verification using callout
@@ -30,9 +33,10 @@
>>> list element: ip4.ip4.ip4.ip4
>>> ip4.ip4.ip4.ip4 in hosts_require_dane? yes (matched "ip4.ip4.ip4.ip4")
>>> interface=NULL port=PORT_D
->>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ... ip4.ip4.ip4.ip4 in hosts_try_fastopen?
->>> list element:
->>> >>> connected
+>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ...
+>>> ip4.ip4.ip4.ip4 in hosts_try_fastopen?
+>>> list element:
+>>> connected
>>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
>>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset)
>>> SMTP>> EHLO myhost.test.ex
diff --git a/test/stderr/5840 b/test/stderr/5840
index 809092727..0b41d07ea 100644
--- a/test/stderr/5840
+++ b/test/stderr/5840
@@ -36,7 +36,7 @@
>>> Connecting to dane256ee.test.ex [ip4.ip4.ip4.ip4]:PORT_D ...
>>> ip4.ip4.ip4.ip4 in hosts_try_fastopen?
>>> list element:
->>> >>> connected
+>>> connected
>>> SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
>>> ip4.ip4.ip4.ip4 in hosts_avoid_esmtp? no (option unset)
>>> SMTP>> EHLO myhost.test.ex

--
## subscription configuration (requires account):
## https://lists.exim.org/mailman3/postorius/lists/exim-cvs.lists.exim.org/
## unsubscribe (doesn't require an account):
## exim-cvs-unsubscribe@???
## Exim details at http://www.exim.org/
## Please use the Wiki with this list - http://wiki.exim.org/

Αυτό το μήνυμα είναι μέρος του ακόλουθου νήματος:
	το πλήρες δέντρο νημάτων ταξινομημένο κατά ημερομηνία