Testsuite: fix munge around tpt connect time

Broken-by: 1d2868b2d90c

diff --git a/test/runtest b/test/runtest
index dac4ed878a8c61efb9a63e983e4cdd30ec4c5ec5..a163a7145f289e0fe42aa0b20b9d5e6693cf5a20 100755 (executable)
--- 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
     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/;
       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$/;
     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\ [^ ]+)?)\ \.\.\.
 
     if (/^([0-9: ]*                                            # possible timestamp
        Connecting\ to\ [^ ]+\ [^ ]+(\ from\ [^ ]+)?)\ \.\.\.

diff --git a/test/stderr/0143 b/test/stderr/0143
index aa16ca8544d51678758ce57dcf24b9f6e7de86ab..f8636e8693e671a572ba05154eef3a0b0c3329c9 100644 (file)
--- 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@domain.com)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S from ip4.ip4.ip4.ip4 ...
 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@domain.com)
 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
   SMTP<< 220 ESMTP
   SMTP>> EHLO myhost.test.ex
 cmd buf flush ddd bytes

diff --git a/test/stderr/0218 b/test/stderr/0218
index c7d80f864cf7330a6ac31246db878a59f33d9167..523585d5b027dd6b1dc74d6abfffefd03e8ebe23 100644 (file)
--- a/test/stderr/0218
+++ b/test/stderr/0218
@@ -27,7 +27,7 @@ CALLER@test.ex 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 ...
 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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK


@@ -109,7 +109,7 @@ CALLER@test.ex 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 ...
 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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK


@@ -143,7 +143,7 @@ CALLER@test.ex 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 ...
 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
 LOG: MAIN
   H=127.0.0.1 [127.0.0.1] Connection refused
 LOG: MAIN


@@ -185,7 +185,7 @@ CALLER@test.ex 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 ...
 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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-OK

diff --git a/test/stderr/0332 b/test/stderr/0332
index c69ae4a60d5765576e8592f0fc42691f19496ea0..8cff3bd214f3b8a4bcc27f5cbf98ca7180fed339 100644 (file)
--- a/test/stderr/0332
+++ b/test/stderr/0332
@@ -33,7 +33,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
   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@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => ok@no.delay 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 b878ee24eb1cdc4ae8c5621aded590f6aaab4c31..0ddd349a332e6758b90d231795a99c15ab75067b 100644 (file)
--- a/test/stderr/0333
+++ b/test/stderr/0333
@@ -31,7 +31,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
   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@no.delay R=r1 T=t1 H=127.0.0.1 [127.0.0.1] C="250 OK"
 cmdlog: '220:EHLO:250-:MAIL|:RCPT|:DATA:250:250:354:.:250'
 LOG: MAIN
   => ok@no.delay 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 54522c7b12a1054def20d9cfe84848cd76b6674c..0e16a6e37422170c00f6ddc5f969f2bf58c719aa 100644 (file)
--- 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
 checking retry status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available

- added retry item for R:userx@test.ex:<jgh@test.ex>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0

 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   added retry item
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> 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
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record

- added retry item for R:userx@test.ex:<jgh@test.ex>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0

 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> 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
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record

- added retry item for R:userx@test.ex:<jgh@test.ex>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0

 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:userx@test.ex:<CALLER@test.ex> from subprocess
   existing delete item dropped

diff --git a/test/stderr/0358 b/test/stderr/0358
index 1dc42006ce14a86a7af49ff88db96ba5210fb04c..8dbb1f66f673a0571072570613dfef2058a6ff6c 100644 (file)
--- 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
 checking retry status of 127.0.0.1
 locking TESTSUITE/spool/db/retry.lockfile
 no retry data available

- added retry item for R:userx@test.ex:<jgh@test.ex>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0

 added retry item for R:usery@test.ex:<CALLER@test.ex>: 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@test.ex:<CALLER@test.ex> from subprocess
 added retry item for R:usery@test.ex:<CALLER@test.ex>: 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@test.ex:<CALLER@test.ex> 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
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record

- added retry item for R:userx@test.ex:<jgh@test.ex>: errno=-44 more_errno=51,A flags=0
+added retry item for R:userx@test.ex:<CALLER@test.ex>: errno=-44 more_errno=dd,A flags=0

 added retry item for R:usery@test.ex:<CALLER@test.ex>: 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@test.ex:<CALLER@test.ex> from subprocess
 added retry item for R:usery@test.ex:<CALLER@test.ex>: 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@test.ex:<CALLER@test.ex> from subprocess

diff --git a/test/stderr/0374 b/test/stderr/0374
index 80275c53f342617bcc30b4e1fd892aa36d7b72d3..cc77313d0353ab64659cc6c1d8431d80896d356d 100644 (file)
--- a/test/stderr/0374
+++ b/test/stderr/0374
@@ -384,16 +384,16 @@ transport error EPIPE ignored
 LOG: MAIN
   == c1@myhost.test.ex 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
 LOG: MAIN
   == c1@myhost.test.ex 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@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1] C="250 OK"
 locking TESTSUITE/spool/db/retry.lockfile
 cmdlog: '220'
 LOG: MAIN
   => d1@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex>: 450 soft error
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   == d2@myhost.test.ex 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@myhost.test.ex>: 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@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 cmdlog: '220'
 LOG: MAIN
   ** d3@myhost.test.ex R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error

diff --git a/test/stderr/0375 b/test/stderr/0375
index ca090a9147dfadf35d1604da0809c7a783b68b68..c118cb04d061f7e4cc8b993f0e1f877a33a31fd8 100644 (file)
--- a/test/stderr/0375
+++ b/test/stderr/0375
@@ -877,41 +877,41 @@ LOG: MAIN
   == c1@myhost.test.ex 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
   == c1@myhost.test.ex 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@myhost.test.ex 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'
 LOG: MAIN
   => d1@myhost.test.ex 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@myhost.test.ex 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@myhost.test.ex>: 450 soft error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   == d2@myhost.test.ex 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@myhost.test.ex>: 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@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 cmdlog: '220'
 LOG: MAIN
   ** d3@myhost.test.ex P=<> R=ut4 T=ut4 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<d3@myhost.test.ex>: 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@myhost.test.ex P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>: 550 hard error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 cmdlog: '220'
 LOG: MAIN
   ** e1@myhost.test.ex P=<> R=ut5 T=ut5 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<e1@myhost.test.ex>: 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@myhost.test.ex P=<CALLER@myhost.test.ex> 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'
 LOG: MAIN
   => f1@myhost.test.ex P=<CALLER@myhost.test.ex> 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@myhost.test.ex 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@myhost.test.ex>: 450 soft error
 log writing disabled
 locking TESTSUITE/spool/db/retry.lockfile
 LOG: MAIN
   == f2@myhost.test.ex 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@myhost.test.ex>: 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@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@myhost.test.ex>: 550 hard error
 cmdlog: '220'
 LOG: MAIN
   ** f3@myhost.test.ex P=<CALLER@myhost.test.ex> R=ut6 T=ut6 H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<f3@myhost.test.ex>: 550 hard error

diff --git a/test/stderr/0376 b/test/stderr/0376
index 9d44a1377e9871b56343469efe7f5c49c41bb124..e781a5b0f4230beae6cb52292341c1d0aedd79a2 100644 (file)
--- 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 ...
 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
   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 ...
 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
 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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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@x.y.z/<somesender@a.domain>
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 callout cache: no address record found for abcd@x.y.z/<somesender@a.domain>
 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
   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@x.y.z
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 callout cache: no address record found for abcd@x.y.z
 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
   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 ...
 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
   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@test.ex/<postmaster@myhost.test.ex>
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 callout cache: no address record found for z@test.ex/<postmaster@myhost.test.ex>
 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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK

diff --git a/test/stderr/0388 b/test/stderr/0388
index c62492e6a79d9208ffdfeab18c09335da2741e01..3422fe1ea8b9b18cf3070f513c0e4378505642c9 100644 (file)
--- 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: 
 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
   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?
 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
 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 f2ae6fef9102cd515a730cca779cabb059caad30..9fcec221ea2af833e1d965e5bc385d1fff0ef9f8 100644 (file)
--- 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: 
 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
   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 197cdbc6eba8dfa9b442e9f0d6b12cf62fef668d..8ae6452dab350b239d40a49dcecc105b63babead 100644 (file)
--- a/test/stderr/0426
+++ b/test/stderr/0426
@@ -52,7 +52,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
   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@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:550:QUIT+:250'
 LOG: MAIN
   ** x@uppercase.test.ex R=r1 T=t1 H=uppercase.test.ex [127.0.0.1]: SMTP error from remote mail server after RCPT TO:<x@UpperCase.test.ex>: 550 Unknown

diff --git a/test/stderr/0432 b/test/stderr/0432
index 885781e1c981b5e474f34043012aa9b53d9d7869..a4f3433d77c0883c8a50785832e7c3c77b175eac 100644 (file)
--- 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: 
 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
   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: 
 >>> 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
 >>>   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: 
 >>> 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
 >>>   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 19be3ace9297388fa88e15af39b99197a0a06002..979b30d458fef0fcaf85d0d664346f29ef525ddd 100644 (file)
--- 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@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D ...
 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@test.ex)
 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
 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@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_D2 ...
 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@test.ex)
 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
 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 d7423c737f55aaaab32fc5e858c22058ad9081fc..f1f6d8fd39198f232c37993bfbaa467db9ff1e3b 100644 (file)
--- 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 ...
 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
   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 ...
 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
   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 ...
 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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250 OK

diff --git a/test/stderr/0473 b/test/stderr/0473
index 1c92bcef2a97e885475fe5724c65c062a6a9fd26..e3e8f01efa6a29c6533be3aa74d100a184fbef25 100644 (file)
--- 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@two.test.ex
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 callout cache: no address record found for r11@two.test.ex
 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
   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@two.test.ex
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 callout cache: no address record found for r11@two.test.ex
 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)'
   SMTP(Connection timed out)<<
   SMTP(close)>>
 cmdlog: '(unset)'

diff --git a/test/stderr/0476 b/test/stderr/0476
index 038e250780371d0ae35295a198739976e5a1db58..61227a3882b016a0dcc32ad6f5987b83a42f3583 100644 (file)
--- 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@test.ex)
 set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@test.ex)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@test.ex)
 set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (userx@test.ex)
 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
   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@the.local.host.name)
 set_process_info: pppp delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@the.local.host.name)
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (CALLER@the.local.host.name)
 set_process_info: pppp delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (CALLER@the.local.host.name)
 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@the.local.host.name: result DEFER
 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@the.local.host.name: result DEFER

diff --git a/test/stderr/0512 b/test/stderr/0512
index 7c0285ce1e29b543700f31228c275fb769c906ee..98f21d1bd3948e3437fdcb34d2e2e9d182a63d27 100644 (file)
--- 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@myhost.test.ex)
 hosts_max_try limit reached with this host
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex)
 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
 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@myhost.test.ex)
 hosts_max_try limit reached with this host
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex)
 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
 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@myhost.test.ex)
 hosts_max_try limit reached with this host
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex)
 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
 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@myhost.test.ex)
 hosts_max_try limit reached with this host
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex)
 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
 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@myhost.test.ex)
 hosts_max_try limit reached with this host
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex)
 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
 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@myhost.test.ex)
 hosts_max_try limit reached with this host
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 delivering 10HmaZ-000000005vi-0000 to 127.0.0.1 [127.0.0.1] (userx@myhost.test.ex)
 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
 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 9cfdba77e8f8dd0808e55d911b6b07aa74299634..5df9df63b70aa62f6256d67ad50a8499dfe1af82 100644 (file)
--- a/test/stderr/0543
+++ b/test/stderr/0543
@@ -32,7 +32,7 @@ After routing:
   Failed addresses:
   Deferred addresses:
 locking TESTSUITE/spool/db/retry.lockfile
   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"
 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 8d77c745e6fa8e1f9057978ab8abad27adc132b5..4e6690afb522535393e544e5bbfb8a074887924e 100644 (file)
--- 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
 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@myhost.test.ex>: errno=-44 more_errno=51,A flags=0
+added retry item for R:x@y:<CALLER@myhost.test.ex>: 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@myhost.test.ex> from subprocess
   added retry item
 cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250'
 reading retry information for R:x@y:<CALLER@myhost.test.ex> 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
 locking TESTSUITE/spool/db/retry.lockfile
 no host retry record
 no message retry record

- added retry item for R:x@y:<jgh@myhost.test.ex>: errno=0 more_errno=0,A flags=1
+added retry item for R:x@y:<CALLER@myhost.test.ex>: 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'
 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 45d558ef9ef62477ba4b88d7168badbb198f7c79..6e746438aa40f766ebae2deb5676513a4d00059e 100644 (file)
--- 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 ...
 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
   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 ...
 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
 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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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 ...
 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
   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@x.y.z/<somesender@a.domain>
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 callout cache: no address record found for abcd@x.y.z/<somesender@a.domain>
 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
   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@x.y.z
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 callout cache: no address record found for abcd@x.y.z
 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
   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 ...
 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
   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@test.ex/<postmaster@myhost.test.ex>
 interface=NULL port=PORT_S
 Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ...
 callout cache: no address record found for z@test.ex/<postmaster@myhost.test.ex>
 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
   SMTP<< 220 Server ready
   SMTP>> EHLO myhost.test.ex
   SMTP<< 250-Yeah mate

diff --git a/test/stderr/1157 b/test/stderr/1157
index cec9563c47b9e0de89328a6ac7a5fa20abc23d3b..7a9ebd556697a7ef20a01b2fc97a24cc0f7e27e4 100644 (file)
--- 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 ...
 >>>>>>>>>>>>>>>> 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
   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 ...
 >>>>>>>>>>>>>>>> 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
   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 ...
 >>>>>>>>>>>>>>>> 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
   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 66f4d48b6e362bfbea220842b5292400b0b966c7..dc19530944da4b4c55e67b9322698638785e832b 100644 (file)
--- 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
 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
   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
   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]
   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 220d4867022bdbece4bb06e25bf7a921ab5ae2b8..98817e63978c4046c3966aeb6ccec4eb1c267524 100644 (file)
--- 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 ...
 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
   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 03065db8d5242abbcd5c802f46139189d57f6cbd..0cbbd20332a39adcb23f95af3e1b844629a5eae0 100644 (file)
--- 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 ...
   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
 connected
 smtp_reap_early_pipe expect banner
   SMTP<< 220 banner

diff --git a/test/stderr/4510 b/test/stderr/4510
index ff04e9c97aea25f8fc024e4c1b34b8b909ca4b51..0ce5029a93bb9314b7f0aad904150bd02cb4a118 100644 (file)
--- 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 ...
 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
   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 fa38719fd4803ac23ab2d2d468f800781f8994cd..30d93160e4577d34fe54461d7c36ca7999b39af9 100644 (file)
--- 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 ...
 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
   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 eafc41309897df6ac75d62af6ad811b6d4264181..b173280d163e0d568cf2a1dc039bc12a9ce82f28 100644 (file)
--- 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: 
 >>> 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
 >>>   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 fda6220120d6cb9c8ec1b0215bd4bfd3ad498bbb..43903aa79ac5c85d63100cacde5b4f1b203b145d 100644 (file)
--- 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: 
 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
 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: 
 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
 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: 
 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
 try option helo_data
  ╭considering: $primary_hostname
  ├──────value: myhost.test.ex

diff --git a/test/stderr/5420 b/test/stderr/5420
index 3ee112b8cf4c88c7569c743b3f873ecc332cb19f..b2b9792970adac9ea52608a8fef9e3b182a2f345 100644 (file)
--- 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
 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
   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
 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 ------------
 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
   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
 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
 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
 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↩
  ╰─────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↩
  ├───────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↩
  ├──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↩
   ├───────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: ↩
   ├──────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: ↩
   ├───────text: ↩

-       
+  ␉

   ├───scanning: }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
   ├───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↩
   ├───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)↩
   ├─────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)↩
   ├──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)↩
    ├───────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)↩
    ╎╭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)↩
    ╎├──────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)↩
    ╎├───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)↩
    ├───────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)↩
    ├───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)↩
   ├──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)↩
    ├───────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: )↩
    ├──────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: )↩
    ├───────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↩
    ├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)↩
    ├───expanded: (helo=$sender_helo_name)↩

-       
+   ␉

    ╰─────result: (helo=myhost.test.ex)↩
    ╰─────result: (helo=myhost.test.ex)↩

-       
+   ␉

               ╰──(tainted)
   ├───item-res: (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↩
              ╰──(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)↩
   ├───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)↩
   ╰─────result: from░CALLER░(helo=myhost.test.ex)↩

-       
+  ␉

              ╰──(tainted)
  ├───item-res: 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↩
             ╰──(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↩
  ├───────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↩
  ├──────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↩
  ├───────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↩
  ├──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↩
   ├───────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↩
   ├──────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↩
   ├───────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↩
   ├───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↩
   ├───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↩
  ├──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↩
   ├───────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: ↩
   ├──────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: ↩
   ├───────text: ↩

-       
+  ␉

   ├───scanning: }}(Exim░$version_number)↩
   ├───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↩
   ├───expanded: ░tls░$tls_in_cipher_std↩

-       
+  ␉

   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: (Exim░$version_number)↩
   ├─────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)↩
  ├───────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: )↩
  ├──────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: )↩
  ├───────text: )↩

-       
+ ␉

  ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ├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>)↩
  ├──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>)↩
   ├───────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@myhost.test.ex
   ├considering: >)↩
   ├──────value: CALLER@myhost.test.ex
   ├considering: >)↩

-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}

   ├───────text: >)↩
   ├───────text: >)↩

-       
+  ␉

   ├considering: }}id░$message_exim_id${if░def:received_for░{↩
   ├considering: }}id░$message_exim_id${if░def:received_for░{↩

-       for░$received_for}}
+  ␉for░$received_for}}

   ├───expanded: (envelope-from░<$sender_address>)↩
   ├───expanded: (envelope-from░<$sender_address>)↩

-       
+  ␉

   ╰─────result: (envelope-from░<CALLER@myhost.test.ex>)↩
   ╰─────result: (envelope-from░<CALLER@myhost.test.ex>)↩

-       
+  ␉

  ├───item-res: (envelope-from░<CALLER@myhost.test.ex>)↩
  ├───item-res: (envelope-from░<CALLER@myhost.test.ex>)↩

-       
+ ␉

             ╰──(tainted)
  ├considering: id░$message_exim_id${if░def:received_for░{↩
             ╰──(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░{↩
  ├───────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░{↩
  ├──────value: 10HmaX-000000005vi-0000
  ├considering: ${if░def:received_for░{↩

-       for░$received_for}}
+ ␉for░$received_for}}

  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩
  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩

-       for░$received_for}}
+  ␉for░$received_for}}

   ├───────text: ↩
   ├───────text: ↩

-       for░
+  ␉for░

   ├considering: $received_for}}
   ├──────value: userx@domain.com
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩
   ├considering: $received_for}}
   ├──────value: userx@domain.com
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩

-       for░$received_for
+  ␉for░$received_for

   ╰─────result: ↩
   ╰─────result: ↩

-       for░userx@domain.com
+  ␉for░userx@domain.com

              ╰──(tainted)
  ├───item-res: ↩
              ╰──(tainted)
  ├───item-res: ↩

-       for░userx@domain.com
+ ␉for░userx@domain.com

             ╰──(tainted)
  ├───expanded: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
             ╰──(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)↩
  ╰─────result: Received:░from░CALLER░(helo=myhost.test.ex)↩

-       by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
-       (envelope-from░<CALLER@myhost.test.ex>)↩
-       id░10HmaX-000000005vi-0000↩
-       for░userx@domain.com
+ ␉by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
+ ␉(envelope-from░<CALLER@myhost.test.ex>)↩
+ ␉id░10HmaX-000000005vi-0000↩
+ ␉for░userx@domain.com

             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 try option acl_smtp_dkim
             ╰──(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}
 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
 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
   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
 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 ------------
 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
   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
 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
 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
 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↩
  ╰─────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↩
  ├───────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↩
  ├──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↩
   ├───────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: ↩
   ├──────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: ↩
   ├───────text: ↩

-       
+  ␉

   ├───scanning: }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
   ├───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↩
   ├───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)↩
   ├─────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)↩
   ├──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)↩
    ├───────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)↩
    ╎╭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)↩
    ╎├──────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)↩
    ╎├───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)↩
    ├───────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)↩
    ├───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)↩
   ├──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)↩
    ├───────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: )↩
    ├──────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: )↩
    ├───────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↩
    ├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)↩
    ├───expanded: (helo=$sender_helo_name)↩

-       
+   ␉

    ╰─────result: (helo=myhost.test.ex)↩
    ╰─────result: (helo=myhost.test.ex)↩

-       
+   ␉

               ╰──(tainted)
   ├───item-res: (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↩
              ╰──(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)↩
   ├───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)↩
   ╰─────result: from░CALLER░(helo=myhost.test.ex)↩

-       
+  ␉

              ╰──(tainted)
  ├───item-res: 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↩
             ╰──(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↩
  ├───────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↩
  ├──────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↩
  ├───────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↩
  ├──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↩
   ├───────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↩
   ├──────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↩
   ├───────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↩
   ├───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↩
   ├───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↩
  ├──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↩
   ├───────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: ↩
   ├──────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: ↩
   ├───────text: ↩

-       
+  ␉

   ├───scanning: }}(Exim░$version_number)↩
   ├───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↩
   ├───expanded: ░tls░$tls_in_cipher_std↩

-       
+  ␉

   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: (Exim░$version_number)↩
   ├─────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)↩
  ├───────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: )↩
  ├──────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: )↩
  ├───────text: )↩

-       
+ ␉

  ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ├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>)↩
  ├──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>)↩
   ├───────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@myhost.test.ex
   ├considering: >)↩
   ├──────value: CALLER@myhost.test.ex
   ├considering: >)↩

-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}

   ├───────text: >)↩
   ├───────text: >)↩

-       
+  ␉

   ├considering: }}id░$message_exim_id${if░def:received_for░{↩
   ├considering: }}id░$message_exim_id${if░def:received_for░{↩

-       for░$received_for}}
+  ␉for░$received_for}}

   ├───expanded: (envelope-from░<$sender_address>)↩
   ├───expanded: (envelope-from░<$sender_address>)↩

-       
+  ␉

   ╰─────result: (envelope-from░<CALLER@myhost.test.ex>)↩
   ╰─────result: (envelope-from░<CALLER@myhost.test.ex>)↩

-       
+  ␉

  ├───item-res: (envelope-from░<CALLER@myhost.test.ex>)↩
  ├───item-res: (envelope-from░<CALLER@myhost.test.ex>)↩

-       
+ ␉

             ╰──(tainted)
  ├considering: id░$message_exim_id${if░def:received_for░{↩
             ╰──(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░{↩
  ├───────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░{↩
  ├──────value: 10HmaZ-000000005vi-0000
  ├considering: ${if░def:received_for░{↩

-       for░$received_for}}
+ ␉for░$received_for}}

  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩
  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩

-       for░$received_for}}
+  ␉for░$received_for}}

   ├───────text: ↩
   ├───────text: ↩

-       for░
+  ␉for░

   ├considering: $received_for}}
   ├──────value: usery@domain.com
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩
   ├considering: $received_for}}
   ├──────value: usery@domain.com
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩

-       for░$received_for
+  ␉for░$received_for

   ╰─────result: ↩
   ╰─────result: ↩

-       for░usery@domain.com
+  ␉for░usery@domain.com

              ╰──(tainted)
  ├───item-res: ↩
              ╰──(tainted)
  ├───item-res: ↩

-       for░usery@domain.com
+ ␉for░usery@domain.com

             ╰──(tainted)
  ├───expanded: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
             ╰──(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)↩
  ╰─────result: Received:░from░CALLER░(helo=myhost.test.ex)↩

-       by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
-       (envelope-from░<CALLER@myhost.test.ex>)↩
-       id░10HmaZ-000000005vi-0000↩
-       for░usery@domain.com
+ ␉by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
+ ␉(envelope-from░<CALLER@myhost.test.ex>)↩
+ ␉id░10HmaZ-000000005vi-0000↩
+ ␉for░usery@domain.com

             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 try option acl_smtp_dkim
             ╰──(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}
 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
 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
   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
 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 ------------
 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
   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
 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
 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
 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↩
  ╰─────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↩
  ├───────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↩
  ├──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↩
   ├───────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: ↩
   ├──────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: ↩
   ├───────text: ↩

-       
+  ␉

   ├───scanning: }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
   ├───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↩
   ├───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)↩
   ├─────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)↩
   ├──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)↩
    ├───────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)↩
    ╎╭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)↩
    ╎├──────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)↩
    ╎├───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)↩
    ├───────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)↩
    ├───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)↩
   ├──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)↩
    ├───────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: )↩
    ├──────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: )↩
    ├───────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↩
    ├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)↩
    ├───expanded: (helo=$sender_helo_name)↩

-       
+   ␉

    ╰─────result: (helo=myhost.test.ex)↩
    ╰─────result: (helo=myhost.test.ex)↩

-       
+   ␉

               ╰──(tainted)
   ├───item-res: (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↩
              ╰──(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)↩
   ├───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)↩
   ╰─────result: from░CALLER░(helo=myhost.test.ex)↩

-       
+  ␉

              ╰──(tainted)
  ├───item-res: 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↩
             ╰──(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↩
  ├───────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↩
  ├──────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↩
  ├───────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↩
  ├──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↩
   ├───────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↩
   ├──────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↩
   ├───────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↩
   ├───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↩
   ├───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↩
  ├──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↩
   ├───────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: ↩
   ├──────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: ↩
   ├───────text: ↩

-       
+  ␉

   ├───scanning: }}(Exim░$version_number)↩
   ├───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↩
   ├───expanded: ░tls░$tls_in_cipher_std↩

-       
+  ␉

   ├─────result:  ◀skipped▶
   ╰───skipping: result is not used
  ├───item-res: 
             ╰──(tainted)
  ├considering: (Exim░$version_number)↩
   ├─────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)↩
  ├───────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: )↩
  ├──────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: )↩
  ├───────text: )↩

-       
+ ␉

  ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
  ├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>)↩
  ├──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>)↩
   ├───────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@myhost.test.ex
   ├considering: >)↩
   ├──────value: CALLER@myhost.test.ex
   ├considering: >)↩

-       }}id░$message_exim_id${if░def:received_for░{↩
-       for░$received_for}}
+  ␉}}id░$message_exim_id${if░def:received_for░{↩
+  ␉for░$received_for}}

   ├───────text: >)↩
   ├───────text: >)↩

-       
+  ␉

   ├considering: }}id░$message_exim_id${if░def:received_for░{↩
   ├considering: }}id░$message_exim_id${if░def:received_for░{↩

-       for░$received_for}}
+  ␉for░$received_for}}

   ├───expanded: (envelope-from░<$sender_address>)↩
   ├───expanded: (envelope-from░<$sender_address>)↩

-       
+  ␉

   ╰─────result: (envelope-from░<CALLER@myhost.test.ex>)↩
   ╰─────result: (envelope-from░<CALLER@myhost.test.ex>)↩

-       
+  ␉

  ├───item-res: (envelope-from░<CALLER@myhost.test.ex>)↩
  ├───item-res: (envelope-from░<CALLER@myhost.test.ex>)↩

-       
+ ␉

             ╰──(tainted)
  ├considering: id░$message_exim_id${if░def:received_for░{↩
             ╰──(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░{↩
  ├───────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░{↩
  ├──────value: 10HmbB-000000005vi-0000
  ├considering: ${if░def:received_for░{↩

-       for░$received_for}}
+ ␉for░$received_for}}

  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩
  ├──condition: def:received_for
  ├─────result: true
   ╭considering: ↩

-       for░$received_for}}
+  ␉for░$received_for}}

   ├───────text: ↩
   ├───────text: ↩

-       for░
+  ␉for░

   ├considering: $received_for}}
   ├──────value: usery@domain.com
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩
   ├considering: $received_for}}
   ├──────value: usery@domain.com
              ╰──(tainted)
   ├considering: }}
   ├───expanded: ↩

-       for░$received_for
+  ␉for░$received_for

   ╰─────result: ↩
   ╰─────result: ↩

-       for░usery@domain.com
+  ␉for░usery@domain.com

              ╰──(tainted)
  ├───item-res: ↩
              ╰──(tainted)
  ├───item-res: ↩

-       for░usery@domain.com
+ ␉for░usery@domain.com

             ╰──(tainted)
  ├───expanded: Received:░${if░def:sender_rcvhost░{from░$sender_rcvhost↩
             ╰──(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)↩
  ╰─────result: Received:░from░CALLER░(helo=myhost.test.ex)↩

-       by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
-       (envelope-from░<CALLER@myhost.test.ex>)↩
-       id░10HmbB-000000005vi-0000↩
-       for░usery@domain.com
+ ␉by░myhost.test.ex░with░local-esmtp░(Exim░x.yz)↩
+ ␉(envelope-from░<CALLER@myhost.test.ex>)↩
+ ␉id░10HmbB-000000005vi-0000↩
+ ␉for░usery@domain.com

             ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 try option acl_smtp_dkim
             ╰──(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}
 try option acl_smtp_data
  ╭considering: ${tod_full}
  ├───expanded: ${tod_full}

diff --git a/test/stderr/5820 b/test/stderr/5820
index 2dff7ec027f1746ede9e8b108a89b6c7084e2b76..43a5f5dfde85d82466647726c4b05156bc0417e1 100644 (file)
--- a/test/stderr/5820
+++ b/test/stderr/5820
@@ -18,9 +18,12 @@
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing rcptuser@dane256ee.test.ex
 >>> calling client router
 >>> >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
 >>> routing rcptuser@dane256ee.test.ex
 >>> 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
 >>> 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
 >>>  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
 >>>   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 809092727e90dd82fbe85dc6a0a39a917f42d08d..0b41d07ea59b12ff5245067013b5506accf598d8 100644 (file)
--- 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: 
 >>> 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
 >>>   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