git://git.exim.org / users / jgh / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Two-phase queue run perf: parallel processes for phase one
[users/jgh/exim.git] / test / stderr / 5420
diff --git a/test/stderr/5420 b/test/stderr/5420
index 5bc80bb1fc90cf90b036b349233fcd90c00225c1..b06eb8d33fc6565b1474d05bb9ba19f06809a643 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -1,43 +1,45 @@
 Exim version x.yz ....
 Exim version x.yz ....
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
- â\94\8cconsidering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ â\95­considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
- â\94\94─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ â\95°─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in chunking_advertise_hosts? no (end of list)
  in tls_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in chunking_advertise_hosts? no (end of list)
  in tls_advertise_hosts? yes (matched "*")
- â\94\8cconsidering: ${if eq {SERVER}{server}{queue}{cutthrough}}
-  â\94\8cconsidering: SERVER}{server}{queue}{cutthrough}}
+ â\95­considering: ${if eq {SERVER}{server}{queue}{cutthrough}}
+  â\95­considering: SERVER}{server}{queue}{cutthrough}}
   ├──expanding: SERVER
   ├──expanding: SERVER
-  â\94\94─────result: SERVER
-  â\94\8cconsidering: server}{queue}{cutthrough}}
+  â\95°─────result: SERVER
+  â\95­considering: server}{queue}{cutthrough}}
   ├──expanding: server
   ├──expanding: server
-  â\94\94─────result: server
+  â\95°─────result: server
  ├──condition: eq {SERVER}{server}
  ├─────result: false
  ├──condition: eq {SERVER}{server}
  ├─────result: false
-  â\94\8c───scanning: queue}{cutthrough}}
+  â\95­───scanning: queue}{cutthrough}}
   ├──expanding: queue
   ├─────result: queue
   ├──expanding: queue
   ├─────result: queue
-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: cutthrough}}
+  â\95°───skipping: result is not used
+  â\95­considering: cutthrough}}
   ├──expanding: cutthrough
   ├──expanding: cutthrough
-  â\94\94─────result: cutthrough
+  â\95°─────result: cutthrough
  ├──expanding: ${if eq {SERVER}{server}{queue}{cutthrough}}
  ├──expanding: ${if eq {SERVER}{server}{queue}{cutthrough}}
- â\94\94─────result: cutthrough
+ â\95°─────result: cutthrough
 using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
- â\94\8cconsidering: $local_part
+ â\95­considering: $local_part
  ├──expanding: $local_part
  ├──expanding: $local_part
- └─────result: userx
+ ╰─────result: userx
+            ╰──(tainted)
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
@@ -45,14 +47,15 @@ end of ACL "cutthrough": ACCEPT
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
- â\94\8cconsidering: $local_part
+ â\95­considering: $local_part
  ├──expanding: $local_part
  ├──expanding: $local_part
- └─────result: userx
+ ╰─────result: userx
+            ╰──(tainted)
 domain.com in "*"? yes (matched "*")
 domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
- â\94\8cconsidering: $primary_hostname
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ...  connected
+ â\95­considering: $primary_hostname
  ├──expanding: $primary_hostname
  ├──expanding: $primary_hostname
- â\94\94─────result: myhost.test.ex
+ â\95°─────result: myhost.test.ex
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 127.0.0.1 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
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
@@ -63,43 +66,45 @@ cmd buf flush ddd bytes
          250-PIPELINING
          250-STARTTLS
          250 HELP
          250-PIPELINING
          250-STARTTLS
          250 HELP
- â\94\8cconsidering: ${if eq {$address_data}{usery}{*}{:}}
-  â\94\8cconsidering: $address_data}{usery}{*}{:}}
+ â\95­considering: ${if eq {$address_data}{usery}{*}{:}}
+  â\95­considering: $address_data}{usery}{*}{:}}
   ├──expanding: $address_data
   ├──expanding: $address_data
-  └─────result: userx
-  ┌considering: usery}{*}{:}}
+  ╰─────result: userx
+             ╰──(tainted)
+  ╭considering: usery}{*}{:}}
   ├──expanding: usery
   ├──expanding: usery
-  â\94\94─────result: usery
+  â\95°─────result: usery
  ├──condition: eq {$address_data}{usery}
  ├─────result: false
  ├──condition: eq {$address_data}{usery}
  ├─────result: false
-  â\94\8c───scanning: *}{:}}
+  â\95­───scanning: *}{:}}
   ├──expanding: *
   ├─────result: *
   ├──expanding: *
   ├─────result: *
-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: :}}
+  â\95°───skipping: result is not used
+  â\95­considering: :}}
   ├──expanding: :
   ├──expanding: :
-  â\94\94─────result: :
+  â\95°─────result: :
  ├──expanding: ${if eq {$address_data}{usery}{*}{:}}
  ├──expanding: ${if eq {$address_data}{usery}{*}{:}}
- â\94\94─────result: :
+ â\95°─────result: :
 127.0.0.1 in hosts_avoid_tls? no (end of list)
 127.0.0.1 in hosts_avoid_tls? no (end of list)
- â\94\8cconsidering: ${if eq {$address_data}{userz}{*}{:}}
-  â\94\8cconsidering: $address_data}{userz}{*}{:}}
+ â\95­considering: ${if eq {$address_data}{userz}{*}{:}}
+  â\95­considering: $address_data}{userz}{*}{:}}
   ├──expanding: $address_data
   ├──expanding: $address_data
-  └─────result: userx
-  ┌considering: userz}{*}{:}}
+  ╰─────result: userx
+             ╰──(tainted)
+  ╭considering: userz}{*}{:}}
   ├──expanding: userz
   ├──expanding: userz
-  â\94\94─────result: userz
+  â\95°─────result: userz
  ├──condition: eq {$address_data}{userz}
  ├─────result: false
  ├──condition: eq {$address_data}{userz}
  ├─────result: false
-  â\94\8c───scanning: *}{:}}
+  â\95­───scanning: *}{:}}
   ├──expanding: *
   ├─────result: *
   ├──expanding: *
   ├─────result: *
-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: :}}
+  â\95°───skipping: result is not used
+  â\95­considering: :}}
   ├──expanding: :
   ├──expanding: :
-  â\94\94─────result: :
+  â\95°─────result: :
  ├──expanding: ${if eq {$address_data}{userz}{*}{:}}
  ├──expanding: ${if eq {$address_data}{userz}{*}{:}}
- â\94\94─────result: :
+ â\95°─────result: :
 127.0.0.1 in hosts_verify_avoid_tls? no (end of list)
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
 127.0.0.1 in hosts_verify_avoid_tls? no (end of list)
   SMTP>> STARTTLS
 cmd buf flush ddd bytes
@@ -127,26 +132,26 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 54)
+processing "accept" (TESTSUITE/test-config 55)
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
- â\94\8cconsidering: ${tod_full}
+ â\95­considering: ${tod_full}
  ├──expanding: ${tod_full}
  ├──expanding: ${tod_full}
- â\94\94─────result: Tue, 2 Mar 1999 09:44:33 +0000
- â\94\8cconsidering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
+ â\95°─────result: Tue, 2 Mar 1999 09:44:33 +0000
+ â\95­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)
        }{${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_cipher_std { tls $tls_in_cipher_std
+       }}}}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
        }}(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
-  â\94\8c───scanning: from $sender_rcvhost
+  â\95­───scanning: from $sender_rcvhost
        }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }{${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_cipher_std { tls $tls_in_cipher_std
+       }}}}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 {
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -155,102 +160,104 @@ end of inline ACL: ACCEPT
        
   ├─────result: from 
        
        
   ├─────result: from 
        
-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: ${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_cipher_std { tls $tls_in_cipher_std
+  â\95°───skipping: result is not used
+  â\95­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}}
   ├──condition: def:sender_ident
   ├─────result: true
        }}(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
-   â\94\8cconsidering: 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_cipher_std { tls $tls_in_cipher_std
+   â\95­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}}
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-   â\95\8eâ\94\8cconsidering: $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_cipher_std { tls $tls_in_cipher_std
+   â\95\8eâ\95­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}}
    ╎├──expanding: $sender_ident
    ╎ }}(Exim $version_number)
    ╎ ${if def:sender_address {(envelope-from <$sender_address>)
    ╎ }}id $message_exim_id${if def:received_for {
    ╎ for $received_for}}
    ╎├──expanding: $sender_ident
-   â\95\8eâ\94\94─────result: CALLER
+   â\95\8eâ\95°─────result: CALLER
    ├──expanding: from ${quote_local_part:$sender_ident} 
    ├──expanding: from ${quote_local_part:$sender_ident} 
-   â\94\94─────result: from CALLER 
+   â\95°─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
   ├──condition: def:sender_helo_name
   ├─────result: true
-   â\94\8cconsidering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   â\95­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}}
    ├──expanding: (helo=$sender_helo_name)
        
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ├──expanding: (helo=$sender_helo_name)
        
-   â\94\94─────result: (helo=myhost.test.ex)
+   â\95°─────result: (helo=myhost.test.ex)
        
        
+              ╰──(tainted)
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }}
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }}
-  â\94\94─────result: from CALLER (helo=myhost.test.ex)
+  â\95°─────result: from CALLER (helo=myhost.test.ex)
        
        
+             ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
  ├──condition: def:received_protocol
  ├─────result: true
-  â\94\8cconsidering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  â\95­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}}
   ├──expanding: with $received_protocol 
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: with $received_protocol 
-  â\94\94─────result: with local-esmtp 
- ├──condition: def:tls_in_cipher_std
+  â\95°─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
  ├─────result: false
  ├─────result: false
-  â\94\8câ\94\80â\94\80â\94\80scanning:  tls $tls_in_cipher_std
+  â\95­â\94\80â\94\80â\94\80scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_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}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       
-  └───skipping: result is not used
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
  ├──condition: def:sender_address
  ├─────result: true
-  â\94\8cconsidering: (envelope-from <$sender_address>)
+  â\95­considering: (envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: (envelope-from <$sender_address>)
        
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: (envelope-from <$sender_address>)
        
-  â\94\94─────result: (envelope-from <CALLER@myhost.test.ex>)
+  â\95°─────result: (envelope-from <CALLER@myhost.test.ex>)
        
  ├──condition: def:received_for
  ├─────result: true
        
  ├──condition: def:received_for
  ├─────result: true
-  â\94\8cconsidering: 
+  â\95­considering: 
        for $received_for}}
   ├──expanding: 
        for $received_for
        for $received_for}}
   ├──expanding: 
        for $received_for
-  â\94\94─────result: 
+  â\95°─────result: 
        for userx@domain.com
        for userx@domain.com
+             ╰──(tainted)
  ├──expanding: 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)
  ├──expanding: 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_cipher_std { tls $tls_in_cipher_std
+       }}}}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}}
- â\94\94─────result: Received: from CALLER (helo=myhost.test.ex)
+ â\95°─────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-0005vi-00
        for userx@domain.com
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaX-0005vi-00
        for userx@domain.com
+            ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
- â\94\8cconsidering: ${tod_full}
+ â\95­considering: ${tod_full}
  ├──expanding: ${tod_full}
  ├──expanding: ${tod_full}
- â\94\94─────result: Tue, 2 Mar 1999 09:44:33 +0000
+ â\95°─────result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
   SMTP<< 250 OK id=10HmaY-0005vi-00
 LOG: MAIN
   SMTP>> .
   SMTP<< 250 OK id=10HmaY-0005vi-00
 LOG: MAIN
@@ -267,45 +274,47 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
- â\94\8cconsidering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ â\95­considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
- â\94\94─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ â\95°─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in chunking_advertise_hosts? no (end of list)
  in tls_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in chunking_advertise_hosts? no (end of list)
  in tls_advertise_hosts? yes (matched "*")
- â\94\8cconsidering: ${if eq {SERVER}{server}{queue}{cutthrough}}
-  â\94\8cconsidering: SERVER}{server}{queue}{cutthrough}}
+ â\95­considering: ${if eq {SERVER}{server}{queue}{cutthrough}}
+  â\95­considering: SERVER}{server}{queue}{cutthrough}}
   ├──expanding: SERVER
   ├──expanding: SERVER
-  â\94\94─────result: SERVER
-  â\94\8cconsidering: server}{queue}{cutthrough}}
+  â\95°─────result: SERVER
+  â\95­considering: server}{queue}{cutthrough}}
   ├──expanding: server
   ├──expanding: server
-  â\94\94─────result: server
+  â\95°─────result: server
  ├──condition: eq {SERVER}{server}
  ├─────result: false
  ├──condition: eq {SERVER}{server}
  ├─────result: false
-  â\94\8c───scanning: queue}{cutthrough}}
+  â\95­───scanning: queue}{cutthrough}}
   ├──expanding: queue
   ├─────result: queue
   ├──expanding: queue
   ├─────result: queue
-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: cutthrough}}
+  â\95°───skipping: result is not used
+  â\95­considering: cutthrough}}
   ├──expanding: cutthrough
   ├──expanding: cutthrough
-  â\94\94─────result: cutthrough
+  â\95°─────result: cutthrough
  ├──expanding: ${if eq {SERVER}{server}{queue}{cutthrough}}
  ├──expanding: ${if eq {SERVER}{server}{queue}{cutthrough}}
- â\94\94─────result: cutthrough
+ â\95°─────result: cutthrough
 using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
- â\94\8cconsidering: $local_part
+ â\95­considering: $local_part
  ├──expanding: $local_part
  ├──expanding: $local_part
- └─────result: usery
+ ╰─────result: usery
+            ╰──(tainted)
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
@@ -313,14 +322,15 @@ end of ACL "cutthrough": ACCEPT
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
- â\94\8cconsidering: $local_part
+ â\95­considering: $local_part
  ├──expanding: $local_part
  ├──expanding: $local_part
- └─────result: usery
+ ╰─────result: usery
+            ╰──(tainted)
 domain.com in "*"? yes (matched "*")
 domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
- â\94\8cconsidering: $primary_hostname
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ...  connected
+ â\95­considering: $primary_hostname
  ├──expanding: $primary_hostname
  ├──expanding: $primary_hostname
- â\94\94─────result: myhost.test.ex
+ â\95°─────result: myhost.test.ex
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 127.0.0.1 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
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
@@ -331,24 +341,25 @@ cmd buf flush ddd bytes
          250-PIPELINING
          250-STARTTLS
          250 HELP
          250-PIPELINING
          250-STARTTLS
          250 HELP
- â\94\8cconsidering: ${if eq {$address_data}{usery}{*}{:}}
-  â\94\8cconsidering: $address_data}{usery}{*}{:}}
+ â\95­considering: ${if eq {$address_data}{usery}{*}{:}}
+  â\95­considering: $address_data}{usery}{*}{:}}
   ├──expanding: $address_data
   ├──expanding: $address_data
-  └─────result: usery
-  ┌considering: usery}{*}{:}}
+  ╰─────result: usery
+             ╰──(tainted)
+  ╭considering: usery}{*}{:}}
   ├──expanding: usery
   ├──expanding: usery
-  â\94\94─────result: usery
+  â\95°─────result: usery
  ├──condition: eq {$address_data}{usery}
  ├─────result: true
  ├──condition: eq {$address_data}{usery}
  ├─────result: true
-  â\94\8cconsidering: *}{:}}
+  â\95­considering: *}{:}}
   ├──expanding: *
   ├──expanding: *
-  â\94\94─────result: *
-  â\94\8c───scanning: :}}
+  â\95°─────result: *
+  â\95­───scanning: :}}
   ├──expanding: :
   ├─────result: :
   ├──expanding: :
   ├─────result: :
-  â\94\94───skipping: result is not used
+  â\95°───skipping: result is not used
  ├──expanding: ${if eq {$address_data}{usery}{*}{:}}
  ├──expanding: ${if eq {$address_data}{usery}{*}{:}}
- â\94\94─────result: *
+ â\95°─────result: *
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")
 127.0.0.1 in hosts_avoid_pipelining? no (option unset)
 using PIPELINING
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")
 127.0.0.1 in hosts_avoid_pipelining? no (option unset)
 using PIPELINING
@@ -363,26 +374,26 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 54)
+processing "accept" (TESTSUITE/test-config 55)
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
- â\94\8cconsidering: ${tod_full}
+ â\95­considering: ${tod_full}
  ├──expanding: ${tod_full}
  ├──expanding: ${tod_full}
- â\94\94─────result: Tue, 2 Mar 1999 09:44:33 +0000
- â\94\8cconsidering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
+ â\95°─────result: Tue, 2 Mar 1999 09:44:33 +0000
+ â\95­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)
        }{${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_cipher_std { tls $tls_in_cipher_std
+       }}}}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
        }}(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
-  â\94\8c───scanning: from $sender_rcvhost
+  â\95­───scanning: from $sender_rcvhost
        }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }{${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_cipher_std { tls $tls_in_cipher_std
+       }}}}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 {
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -391,102 +402,104 @@ end of inline ACL: ACCEPT
        
   ├─────result: from 
        
        
   ├─────result: from 
        
-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: ${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_cipher_std { tls $tls_in_cipher_std
+  â\95°───skipping: result is not used
+  â\95­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}}
   ├──condition: def:sender_ident
   ├─────result: true
        }}(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
-   â\94\8cconsidering: 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_cipher_std { tls $tls_in_cipher_std
+   â\95­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}}
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-   â\95\8eâ\94\8cconsidering: $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_cipher_std { tls $tls_in_cipher_std
+   â\95\8eâ\95­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}}
    ╎├──expanding: $sender_ident
    ╎ }}(Exim $version_number)
    ╎ ${if def:sender_address {(envelope-from <$sender_address>)
    ╎ }}id $message_exim_id${if def:received_for {
    ╎ for $received_for}}
    ╎├──expanding: $sender_ident
-   â\95\8eâ\94\94─────result: CALLER
+   â\95\8eâ\95°─────result: CALLER
    ├──expanding: from ${quote_local_part:$sender_ident} 
    ├──expanding: from ${quote_local_part:$sender_ident} 
-   â\94\94─────result: from CALLER 
+   â\95°─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
   ├──condition: def:sender_helo_name
   ├─────result: true
-   â\94\8cconsidering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   â\95­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}}
    ├──expanding: (helo=$sender_helo_name)
        
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ├──expanding: (helo=$sender_helo_name)
        
-   â\94\94─────result: (helo=myhost.test.ex)
+   â\95°─────result: (helo=myhost.test.ex)
        
        
+              ╰──(tainted)
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }}
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }}
-  â\94\94─────result: from CALLER (helo=myhost.test.ex)
+  â\95°─────result: from CALLER (helo=myhost.test.ex)
        
        
+             ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
  ├──condition: def:received_protocol
  ├─────result: true
-  â\94\8cconsidering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  â\95­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}}
   ├──expanding: with $received_protocol 
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: with $received_protocol 
-  â\94\94─────result: with local-esmtp 
- ├──condition: def:tls_in_cipher_std
+  â\95°─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
  ├─────result: false
  ├─────result: false
-  â\94\8câ\94\80â\94\80â\94\80scanning:  tls $tls_in_cipher_std
+  â\95­â\94\80â\94\80â\94\80scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_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}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       
-  └───skipping: result is not used
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
  ├──condition: def:sender_address
  ├─────result: true
-  â\94\8cconsidering: (envelope-from <$sender_address>)
+  â\95­considering: (envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: (envelope-from <$sender_address>)
        
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: (envelope-from <$sender_address>)
        
-  â\94\94─────result: (envelope-from <CALLER@myhost.test.ex>)
+  â\95°─────result: (envelope-from <CALLER@myhost.test.ex>)
        
  ├──condition: def:received_for
  ├─────result: true
        
  ├──condition: def:received_for
  ├─────result: true
-  â\94\8cconsidering: 
+  â\95­considering: 
        for $received_for}}
   ├──expanding: 
        for $received_for
        for $received_for}}
   ├──expanding: 
        for $received_for
-  â\94\94─────result: 
+  â\95°─────result: 
        for usery@domain.com
        for usery@domain.com
+             ╰──(tainted)
  ├──expanding: 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)
  ├──expanding: 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_cipher_std { tls $tls_in_cipher_std
+       }}}}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}}
- â\94\94─────result: Received: from CALLER (helo=myhost.test.ex)
+ â\95°─────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-0005vi-00
        for usery@domain.com
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmaZ-0005vi-00
        for usery@domain.com
+            ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
- â\94\8cconsidering: ${tod_full}
+ â\95­considering: ${tod_full}
  ├──expanding: ${tod_full}
  ├──expanding: ${tod_full}
- â\94\94─────result: Tue, 2 Mar 1999 09:44:33 +0000
+ â\95°─────result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
   SMTP<< 250 OK id=10HmbA-0005vi-00
 LOG: MAIN
   SMTP>> .
   SMTP<< 250 OK id=10HmbA-0005vi-00
 LOG: MAIN
@@ -503,45 +516,47 @@ LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
 configuration file is TESTSUITE/test-config
 admin user
  in hosts_connection_nolog? no (option unset)
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
- â\94\8cconsidering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
+ â\95­considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
  ├──expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
- â\94\94─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+ â\95°─────result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in chunking_advertise_hosts? no (end of list)
  in tls_advertise_hosts? yes (matched "*")
  in dsn_advertise_hosts? no (option unset)
  in pipelining_advertise_hosts? yes (matched "*")
  in chunking_advertise_hosts? no (end of list)
  in tls_advertise_hosts? yes (matched "*")
- â\94\8cconsidering: ${if eq {SERVER}{server}{queue}{cutthrough}}
-  â\94\8cconsidering: SERVER}{server}{queue}{cutthrough}}
+ â\95­considering: ${if eq {SERVER}{server}{queue}{cutthrough}}
+  â\95­considering: SERVER}{server}{queue}{cutthrough}}
   ├──expanding: SERVER
   ├──expanding: SERVER
-  â\94\94─────result: SERVER
-  â\94\8cconsidering: server}{queue}{cutthrough}}
+  â\95°─────result: SERVER
+  â\95­considering: server}{queue}{cutthrough}}
   ├──expanding: server
   ├──expanding: server
-  â\94\94─────result: server
+  â\95°─────result: server
  ├──condition: eq {SERVER}{server}
  ├─────result: false
  ├──condition: eq {SERVER}{server}
  ├─────result: false
-  â\94\8c───scanning: queue}{cutthrough}}
+  â\95­───scanning: queue}{cutthrough}}
   ├──expanding: queue
   ├─────result: queue
   ├──expanding: queue
   ├─────result: queue
-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: cutthrough}}
+  â\95°───skipping: result is not used
+  â\95­considering: cutthrough}}
   ├──expanding: cutthrough
   ├──expanding: cutthrough
-  â\94\94─────result: cutthrough
+  â\95°─────result: cutthrough
  ├──expanding: ${if eq {SERVER}{server}{queue}{cutthrough}}
  ├──expanding: ${if eq {SERVER}{server}{queue}{cutthrough}}
- â\94\94─────result: cutthrough
+ â\95°─────result: cutthrough
 using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 using ACL "cutthrough"
 processing "accept" (TESTSUITE/test-config 22)
 check control = cutthrough_delivery
 check verify = recipient
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
- â\94\8cconsidering: $local_part
+ â\95­considering: $local_part
  ├──expanding: $local_part
  ├──expanding: $local_part
- └─────result: usery
+ ╰─────result: usery
+            ╰──(tainted)
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
 domain.com in "*"? yes (matched "*")
 ----------- end verify ------------
 accept: condition test succeeded in ACL "cutthrough"
@@ -549,14 +564,15 @@ end of ACL "cutthrough": ACCEPT
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
 ----------- start cutthrough setup ------------
 domain.com in "test.ex : *.test.ex"? no (end of list)
 domain.com in "! +local_domains"? yes (end of list)
- â\94\8cconsidering: $local_part
+ â\95­considering: $local_part
  ├──expanding: $local_part
  ├──expanding: $local_part
- └─────result: usery
+ ╰─────result: usery
+            ╰──(tainted)
 domain.com in "*"? yes (matched "*")
 domain.com in "*"? yes (matched "*")
-Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ... connected
- â\94\8cconsidering: $primary_hostname
+Connecting to 127.0.0.1 [127.0.0.1]:1225 from ip4.ip4.ip4.ip4 ...  connected
+ â\95­considering: $primary_hostname
  ├──expanding: $primary_hostname
  ├──expanding: $primary_hostname
- â\94\94─────result: myhost.test.ex
+ â\95°─────result: myhost.test.ex
   SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 127.0.0.1 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
 127.0.0.1 in hosts_avoid_esmtp? no (option unset)
   SMTP>> EHLO myhost.test.ex
@@ -567,24 +583,25 @@ cmd buf flush ddd bytes
          250-PIPELINING
          250-STARTTLS
          250 HELP
          250-PIPELINING
          250-STARTTLS
          250 HELP
- â\94\8cconsidering: ${if eq {$address_data}{usery}{*}{:}}
-  â\94\8cconsidering: $address_data}{usery}{*}{:}}
+ â\95­considering: ${if eq {$address_data}{usery}{*}{:}}
+  â\95­considering: $address_data}{usery}{*}{:}}
   ├──expanding: $address_data
   ├──expanding: $address_data
-  └─────result: usery
-  ┌considering: usery}{*}{:}}
+  ╰─────result: usery
+             ╰──(tainted)
+  ╭considering: usery}{*}{:}}
   ├──expanding: usery
   ├──expanding: usery
-  â\94\94─────result: usery
+  â\95°─────result: usery
  ├──condition: eq {$address_data}{usery}
  ├─────result: true
  ├──condition: eq {$address_data}{usery}
  ├─────result: true
-  â\94\8cconsidering: *}{:}}
+  â\95­considering: *}{:}}
   ├──expanding: *
   ├──expanding: *
-  â\94\94─────result: *
-  â\94\8c───scanning: :}}
+  â\95°─────result: *
+  â\95­───scanning: :}}
   ├──expanding: :
   ├─────result: :
   ├──expanding: :
   ├─────result: :
-  â\94\94───skipping: result is not used
+  â\95°───skipping: result is not used
  ├──expanding: ${if eq {$address_data}{usery}{*}{:}}
  ├──expanding: ${if eq {$address_data}{usery}{*}{:}}
- â\94\94─────result: *
+ â\95°─────result: *
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")
 127.0.0.1 in hosts_avoid_pipelining? no (option unset)
 using PIPELINING
 127.0.0.1 in hosts_avoid_tls? yes (matched "*")
 127.0.0.1 in hosts_avoid_pipelining? no (option unset)
 using PIPELINING
@@ -599,26 +616,26 @@ sync_responses expect rcpt
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
   SMTP<< 250 Accepted
 holding verify callout open for cutthrough delivery
 ----------- end cutthrough setup ------------
-processing "accept" (TESTSUITE/test-config 54)
+processing "accept" (TESTSUITE/test-config 55)
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
 accept: condition test succeeded in inline ACL
 end of inline ACL: ACCEPT
   SMTP>> DATA
   SMTP<< 354 Enter message, ending with "." on a line by itself
- â\94\8cconsidering: ${tod_full}
+ â\95­considering: ${tod_full}
  ├──expanding: ${tod_full}
  ├──expanding: ${tod_full}
- â\94\94─────result: Tue, 2 Mar 1999 09:44:33 +0000
- â\94\8cconsidering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
+ â\95°─────result: Tue, 2 Mar 1999 09:44:33 +0000
+ â\95­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)
        }{${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_cipher_std { tls $tls_in_cipher_std
+       }}}}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
        }}(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
-  â\94\8c───scanning: from $sender_rcvhost
+  â\95­───scanning: from $sender_rcvhost
        }{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }{${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_cipher_std { tls $tls_in_cipher_std
+       }}}}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 {
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
@@ -627,102 +644,104 @@ end of inline ACL: ACCEPT
        
   ├─────result: from 
        
        
   ├─────result: from 
        
-  â\94\94───skipping: result is not used
-  â\94\8cconsidering: ${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_cipher_std { tls $tls_in_cipher_std
+  â\95°───skipping: result is not used
+  â\95­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}}
   ├──condition: def:sender_ident
   ├─────result: true
        }}(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
-   â\94\8cconsidering: 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_cipher_std { tls $tls_in_cipher_std
+   â\95­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}}
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
-   â\95\8eâ\94\8cconsidering: $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_cipher_std { tls $tls_in_cipher_std
+   â\95\8eâ\95­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}}
    ╎├──expanding: $sender_ident
    ╎ }}(Exim $version_number)
    ╎ ${if def:sender_address {(envelope-from <$sender_address>)
    ╎ }}id $message_exim_id${if def:received_for {
    ╎ for $received_for}}
    ╎├──expanding: $sender_ident
-   â\95\8eâ\94\94─────result: CALLER
+   â\95\8eâ\95°─────result: CALLER
    ├──expanding: from ${quote_local_part:$sender_ident} 
    ├──expanding: from ${quote_local_part:$sender_ident} 
-   â\94\94─────result: from CALLER 
+   â\95°─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
   ├──condition: def:sender_helo_name
   ├─────result: true
-   â\94\8cconsidering: (helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+   â\95­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}}
    ├──expanding: (helo=$sender_helo_name)
        
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
    ├──expanding: (helo=$sender_helo_name)
        
-   â\94\94─────result: (helo=myhost.test.ex)
+   â\95°─────result: (helo=myhost.test.ex)
        
        
+              ╰──(tainted)
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }}
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
        }}
-  â\94\94─────result: from CALLER (helo=myhost.test.ex)
+  â\95°─────result: from CALLER (helo=myhost.test.ex)
        
        
+             ╰──(tainted)
  ├──condition: def:received_protocol
  ├─────result: true
  ├──condition: def:received_protocol
  ├─────result: true
-  â\94\8cconsidering: with $received_protocol }}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
+  â\95­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}}
   ├──expanding: with $received_protocol 
        }}(Exim $version_number)
        ${if def:sender_address {(envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: with $received_protocol 
-  â\94\94─────result: with local-esmtp 
- ├──condition: def:tls_in_cipher_std
+  â\95°─────result: with local-esmtp 
+ ├──condition: def:tls_in_ver
  ├─────result: false
  ├─────result: false
-  â\94\8câ\94\80â\94\80â\94\80scanning:  tls $tls_in_cipher_std
+  â\95­â\94\80â\94\80â\94\80scanning:  ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_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}}
-  ├──expanding:  tls $tls_in_cipher_std
-       
-  ├─────result:  tls 
-       
-  └───skipping: result is not used
+  ├──expanding:  ($tls_in_ver)
+  ├─────result:  ()
+  ╰───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
  ├──condition: def:sender_address
  ├─────result: true
-  â\94\8cconsidering: (envelope-from <$sender_address>)
+  â\95­considering: (envelope-from <$sender_address>)
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: (envelope-from <$sender_address>)
        
        }}id $message_exim_id${if def:received_for {
        for $received_for}}
   ├──expanding: (envelope-from <$sender_address>)
        
-  â\94\94─────result: (envelope-from <CALLER@myhost.test.ex>)
+  â\95°─────result: (envelope-from <CALLER@myhost.test.ex>)
        
  ├──condition: def:received_for
  ├─────result: true
        
  ├──condition: def:received_for
  ├─────result: true
-  â\94\8cconsidering: 
+  â\95­considering: 
        for $received_for}}
   ├──expanding: 
        for $received_for
        for $received_for}}
   ├──expanding: 
        for $received_for
-  â\94\94─────result: 
+  â\95°─────result: 
        for usery@domain.com
        for usery@domain.com
+             ╰──(tainted)
  ├──expanding: 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)
  ├──expanding: 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_cipher_std { tls $tls_in_cipher_std
+       }}}}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}}
- â\94\94─────result: Received: from CALLER (helo=myhost.test.ex)
+ â\95°─────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-0005vi-00
        for usery@domain.com
        by myhost.test.ex with local-esmtp (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
        id 10HmbB-0005vi-00
        for usery@domain.com
+            ╰──(tainted)
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
- â\94\8cconsidering: ${tod_full}
+ â\95­considering: ${tod_full}
  ├──expanding: ${tod_full}
  ├──expanding: ${tod_full}
- â\94\94─────result: Tue, 2 Mar 1999 09:44:33 +0000
+ â\95°─────result: Tue, 2 Mar 1999 09:44:33 +0000
   SMTP>> .
   SMTP<< 250 OK id=10HmbC-0005vi-00
 LOG: MAIN
   SMTP>> .
   SMTP<< 250 OK id=10HmbC-0005vi-00
 LOG: MAIN
Jeremy Harris' staging directory