Debug: Use UTF-8 linedrawing, for indent partial-markers

diff --git a/src/src/debug.c b/src/src/debug.c
index ee284d0be7540d23953bdde94116dc04c3c5a803..35571547f656ed6c465509d6da102d357ab89ff1 100644 (file)
--- a/src/src/debug.c
+++ b/src/src/debug.c
@@ -211,11 +211,13 @@ if (indent > 0)
   int i;
   for (i = indent >> 2; i > 0; i--)
     {
   int i;
   for (i = indent >> 2; i > 0; i--)
     {

-    Ustrcpy(debug_ptr, "   .");
-    debug_ptr += 4;
+    Ustrcpy(debug_ptr, "   " UTF8_VERT_2DASH);
+    debug_ptr += 6;    /* 3 spaces + 3 UTF-8 octets */
+    debug_prefix_length += 6;

     }
     }

-  Ustrncpy(debug_ptr, "   ", indent & 3);
-  debug_ptr += indent & 3;
+  Ustrncpy(debug_ptr, "   ", indent &= 3);
+  debug_ptr += indent;
+  debug_prefix_length += indent;

   }
 
 /* Use the checked formatting routine to ensure that the buffer
   }
 
 /* Use the checked formatting routine to ensure that the buffer

diff --git a/src/src/macros.h b/src/src/macros.h
index 4efeee92805353460814cf3a6b5b7defb1d31e4a..004d6dfd7304f894bb28a2badd97375d64c380ed 100644 (file)
--- a/src/src/macros.h
+++ b/src/src/macros.h
@@ -980,6 +980,7 @@ enum { FILTER_UNSET, FILTER_FORWARD, FILTER_EXIM, FILTER_SIEVE };
 #define UTF8_HORIZ             "\xE2\x94\x80"
 #define UTF8_VERT_RIGHT                "\xE2\x94\x9C"
 #define UTF8_UP_RIGHT          "\xE2\x94\x94"
 #define UTF8_HORIZ             "\xE2\x94\x80"
 #define UTF8_VERT_RIGHT                "\xE2\x94\x9C"
 #define UTF8_UP_RIGHT          "\xE2\x94\x94"

+#define UTF8_VERT_2DASH                "\xE2\x95\x8E"

 
 
 
 
 
 

diff --git a/test/stderr/0023 b/test/stderr/0023
index a21b6b80f432b02881665656f54af131d82eb797..6f7615a41ad920da3817494f96a3ef01ff4e567a 100644 (file)
--- a/test/stderr/0023
+++ b/test/stderr/0023
@@ -518,74 +518,74 @@ LOG: H=[5.6.12.1] F=<x@y> rejected RCPT <x@y>: failed nested acl
 >>>    using ACL "acl_8_8_8"
 >>>    processing "accept"
 >>>    check acl = acl_8_8_8
 >>>    using ACL "acl_8_8_8"
 >>>    processing "accept"
 >>>    check acl = acl_8_8_8

->>>    .using ACL "acl_8_8_8"
->>>    .processing "accept"
->>>    .check acl = acl_8_8_8
->>>    . using ACL "acl_8_8_8"
->>>    . processing "accept"
->>>    . check acl = acl_8_8_8
->>>    .  using ACL "acl_8_8_8"
->>>    .  processing "accept"
->>>    .  check acl = acl_8_8_8
->>>    .   using ACL "acl_8_8_8"
->>>    .   processing "accept"
->>>    .   check acl = acl_8_8_8
->>>    .   .using ACL "acl_8_8_8"
->>>    .   .processing "accept"
->>>    .   .check acl = acl_8_8_8
->>>    .   . using ACL "acl_8_8_8"
->>>    .   . processing "accept"
->>>    .   . check acl = acl_8_8_8
->>>    .   .  using ACL "acl_8_8_8"
->>>    .   .  processing "accept"
->>>    .   .  check acl = acl_8_8_8
->>>    .   .   using ACL "acl_8_8_8"
->>>    .   .   processing "accept"
->>>    .   .   check acl = acl_8_8_8
->>>    .   .   .using ACL "acl_8_8_8"
->>>    .   .   .processing "accept"
->>>    .   .   .check acl = acl_8_8_8
->>>    .   .   . using ACL "acl_8_8_8"
->>>    .   .   . processing "accept"
->>>    .   .   . check acl = acl_8_8_8
->>>    .   .   .  using ACL "acl_8_8_8"
->>>    .   .   .  processing "accept"
->>>    .   .   .  check acl = acl_8_8_8
->>>    .   .   .   using ACL "acl_8_8_8"
->>>    .   .   .   processing "accept"
->>>    .   .   .   check acl = acl_8_8_8
->>>    .   .   .   .using ACL "acl_8_8_8"
->>>    .   .   .   .processing "accept"
->>>    .   .   .   .check acl = acl_8_8_8
->>>    .   .   .   . using ACL "acl_8_8_8"
->>>    .   .   .   . processing "accept"
->>>    .   .   .   . check acl = acl_8_8_8
->>>    .   .   .   .  using ACL "acl_8_8_8"
->>>    .   .   .   .  processing "accept"
->>>    .   .   .   .  check acl = acl_8_8_8
->>>    .   .   .   .   using ACL "acl_8_8_8"
->>>    .   .   .   .   processing "accept"
->>>    .   .   .   .   check acl = acl_8_8_8
->>>    .   .   .   .   .using ACL "acl_8_8_8"
->>>    .   .   .   .   .processing "accept"
->>>    .   .   .   .   .check acl = acl_8_8_8
->>>    .   .   .   .   .accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   .   .   accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   .   .  accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   .   . accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   .   .accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   .   accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   .  accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   . accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   .accept: condition test error in ACL "acl_8_8_8"
->>>    .   .   accept: condition test error in ACL "acl_8_8_8"
->>>    .   .  accept: condition test error in ACL "acl_8_8_8"
->>>    .   . accept: condition test error in ACL "acl_8_8_8"
->>>    .   .accept: condition test error in ACL "acl_8_8_8"
->>>    .   accept: condition test error in ACL "acl_8_8_8"
->>>    .  accept: condition test error in ACL "acl_8_8_8"
->>>    . accept: condition test error in ACL "acl_8_8_8"
->>>    .accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎using ACL "acl_8_8_8"
+>>>    ╎processing "accept"
+>>>    ╎check acl = acl_8_8_8
+>>>    ╎ using ACL "acl_8_8_8"
+>>>    ╎ processing "accept"
+>>>    ╎ check acl = acl_8_8_8
+>>>    ╎  using ACL "acl_8_8_8"
+>>>    ╎  processing "accept"
+>>>    ╎  check acl = acl_8_8_8
+>>>    ╎   using ACL "acl_8_8_8"
+>>>    ╎   processing "accept"
+>>>    ╎   check acl = acl_8_8_8
+>>>    ╎   ╎using ACL "acl_8_8_8"
+>>>    ╎   ╎processing "accept"
+>>>    ╎   ╎check acl = acl_8_8_8
+>>>    ╎   ╎ using ACL "acl_8_8_8"
+>>>    ╎   ╎ processing "accept"
+>>>    ╎   ╎ check acl = acl_8_8_8
+>>>    ╎   ╎  using ACL "acl_8_8_8"
+>>>    ╎   ╎  processing "accept"
+>>>    ╎   ╎  check acl = acl_8_8_8
+>>>    ╎   ╎   using ACL "acl_8_8_8"
+>>>    ╎   ╎   processing "accept"
+>>>    ╎   ╎   check acl = acl_8_8_8
+>>>    ╎   ╎   ╎using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎processing "accept"
+>>>    ╎   ╎   ╎check acl = acl_8_8_8
+>>>    ╎   ╎   ╎ using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎ processing "accept"
+>>>    ╎   ╎   ╎ check acl = acl_8_8_8
+>>>    ╎   ╎   ╎  using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎  processing "accept"
+>>>    ╎   ╎   ╎  check acl = acl_8_8_8
+>>>    ╎   ╎   ╎   using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   processing "accept"
+>>>    ╎   ╎   ╎   check acl = acl_8_8_8
+>>>    ╎   ╎   ╎   ╎using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎processing "accept"
+>>>    ╎   ╎   ╎   ╎check acl = acl_8_8_8
+>>>    ╎   ╎   ╎   ╎ using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎ processing "accept"
+>>>    ╎   ╎   ╎   ╎ check acl = acl_8_8_8
+>>>    ╎   ╎   ╎   ╎  using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎  processing "accept"
+>>>    ╎   ╎   ╎   ╎  check acl = acl_8_8_8
+>>>    ╎   ╎   ╎   ╎   using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎   processing "accept"
+>>>    ╎   ╎   ╎   ╎   check acl = acl_8_8_8
+>>>    ╎   ╎   ╎   ╎   ╎using ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎   ╎processing "accept"
+>>>    ╎   ╎   ╎   ╎   ╎check acl = acl_8_8_8
+>>>    ╎   ╎   ╎   ╎   ╎accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎   accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎  accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎ accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   ╎accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎   accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎  accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎ accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   ╎accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎   accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎  accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎ accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   ╎accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎   accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎  accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎ accept: condition test error in ACL "acl_8_8_8"
+>>>    ╎accept: condition test error in ACL "acl_8_8_8"

 >>>    accept: condition test error in ACL "acl_8_8_8"
 >>>   accept: condition test error in ACL "acl_8_8_8"
 >>>  accept: condition test error in ACL "acl_8_8_8"
 >>>    accept: condition test error in ACL "acl_8_8_8"
 >>>   accept: condition test error in ACL "acl_8_8_8"
 >>>  accept: condition test error in ACL "acl_8_8_8"

diff --git a/test/stderr/0402 b/test/stderr/0402
index 89121366a6d235bc40d0f50e9086b344b33ea9e7..a007de31c68edc370f755f07b68de3e76ae6b6d0 100644 (file)
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -45,107 +45,107 @@ Data file written for message 10HmaX-0005vi-00
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌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}} (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}} (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}} (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}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: from $sender_rcvhost
   ├──expanding: from $sender_rcvhost

-       
+       

   ├─────result: from 
   ├─────result: from 

-       
+       

   └───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)
   └───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}} (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}} (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}} (Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-   .┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (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
-   .└─────result: CALLER
+       }}}}by $primary_hostname ${if def:received_protocol {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}}
+   ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   ╎ }}}}by $primary_hostname ${if def:received_protocol {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: $sender_ident
+   ╎└─────result: CALLER

    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: false
    ┌───scanning: (helo=$sender_helo_name)
    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: false
    ┌───scanning: (helo=$sender_helo_name)

-       }}}}by $primary_hostname ${if def:received_protocol {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}}
+       }}}}by $primary_hostname ${if def:received_protocol {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: (helo=$sender_helo_name)
    ├──expanding: (helo=$sender_helo_name)

-       
+       

    ├─────result: (helo=)
    ├─────result: (helo=)

-       
+       

    └───skipping: result is not used
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
    └───skipping: result is not used
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)

-       }}
+       }}

   └─────result: from CALLER 
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: with $received_protocol}} (Exim $version_number)
   └─────result: from CALLER 
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: 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}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: with $received_protocol
   └─────result: with local
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)
   ├──expanding: with $received_protocol
   └─────result: with local
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)

-       }}(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_cipher)
   ├──expanding: ($tls_cipher)

-       
+       

   ├─────result: ()
   ├─────result: ()

-       
+       

   └───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ┌considering: (envelope-from <$sender_address>)
   └───skipping: result is not used
  ├──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}}

   ├──expanding: (envelope-from <$sender_address>)
   ├──expanding: (envelope-from <$sender_address>)

-       
+       

   └─────result: (envelope-from <CALLER@test.ex>)
   └─────result: (envelope-from <CALLER@test.ex>)

-       
+       

  ├──condition: def:received_for
  ├─────result: false
   ┌───scanning: 
  ├──condition: def:received_for
  ├─────result: false
   ┌───scanning: 

-       for $received_for}}
+       for $received_for}}

   ├──expanding: 
   ├──expanding: 

-       for $received_for
+       for $received_for

   ├─────result: 
   ├─────result: 

-       for 
+       for 

   └───skipping: result is not used
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
   └───skipping: result is not used
  ├──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}} (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}} (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 by mail.test.ex with local (Exim x.yz)
  └─────result: Received: from CALLER by mail.test.ex with local (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00
+       (envelope-from <CALLER@test.ex>)
+       id 10HmaX-0005vi-00

 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 >>Generated Received: header line
 P Received: from CALLER by mail.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)


@@ -470,22 +470,22 @@ lock file created
 mailbox TESTSUITE/test-mail/junk is locked
 writing to file TESTSUITE/test-mail/junk
  ┌considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
 mailbox TESTSUITE/test-mail/junk is locked
 writing to file TESTSUITE/test-mail/junk
  ┌considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}

-
+ 

  ├──condition: def:return_path
  ├─────result: true
   ┌considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
  ├──condition: def:return_path
  ├─────result: true
   ┌considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox}

-
+  

   ├──expanding: $return_path
   └─────result: CALLER@test.ex
   ┌───scanning: MAILER-DAEMON}} ${tod_bsdinbox}
   ├──expanding: $return_path
   └─────result: CALLER@test.ex
   ┌───scanning: MAILER-DAEMON}} ${tod_bsdinbox}

-
+  

   ├──expanding: MAILER-DAEMON
   ├─────result: MAILER-DAEMON
   └───skipping: result is not used
  ├──expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
   ├──expanding: MAILER-DAEMON
   ├─────result: MAILER-DAEMON
   └───skipping: result is not used
  ├──expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}

-
+ 

  └─────result: From CALLER@test.ex Tue Mar 02 09:44:33 1999
  └─────result: From CALLER@test.ex Tue Mar 02 09:44:33 1999

-
+ 

 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0


@@ -525,22 +525,22 @@ lock file created
 mailbox TESTSUITE/test-mail/junk is locked
 writing to file TESTSUITE/test-mail/junk
  ┌considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
 mailbox TESTSUITE/test-mail/junk is locked
 writing to file TESTSUITE/test-mail/junk
  ┌considering: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}

-
+ 

  ├──condition: def:return_path
  ├─────result: true
   ┌considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
  ├──condition: def:return_path
  ├─────result: true
   ┌considering: $return_path}{MAILER-DAEMON}} ${tod_bsdinbox}

-
+  

   ├──expanding: $return_path
   └─────result: CALLER@test.ex
   ┌───scanning: MAILER-DAEMON}} ${tod_bsdinbox}
   ├──expanding: $return_path
   └─────result: CALLER@test.ex
   ┌───scanning: MAILER-DAEMON}} ${tod_bsdinbox}

-
+  

   ├──expanding: MAILER-DAEMON
   ├─────result: MAILER-DAEMON
   └───skipping: result is not used
  ├──expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}
   ├──expanding: MAILER-DAEMON
   ├─────result: MAILER-DAEMON
   └───skipping: result is not used
  ├──expanding: From ${if def:return_path{$return_path}{MAILER-DAEMON}} ${tod_bsdinbox}

-
+ 

  └─────result: From CALLER@test.ex Tue Mar 02 09:44:33 1999
  └─────result: From CALLER@test.ex Tue Mar 02 09:44:33 1999

-
+ 

 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0
 writing data block fd=dddd size=sss timeout=0

diff --git a/test/stderr/0544 b/test/stderr/0544
index 44582a1cce3c2e492562917de56e578c55c435cc..f32cd888622e15603746540743aa620ae3459c03 100644 (file)
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -5,107 +5,107 @@ admin user
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌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}} (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}} (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}} (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}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: from $sender_rcvhost
   ├──expanding: from $sender_rcvhost

-       
+       

   ├─────result: from 
   ├─────result: from 

-       
+       

   └───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)
   └───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}} (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}} (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}} (Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-   .┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (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
-   .└─────result: CALLER
+       }}}}by $primary_hostname ${if def:received_protocol {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}}
+   ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   ╎ }}}}by $primary_hostname ${if def:received_protocol {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: $sender_ident
+   ╎└─────result: CALLER

    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: false
    ┌───scanning: (helo=$sender_helo_name)
    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: false
    ┌───scanning: (helo=$sender_helo_name)

-       }}}}by $primary_hostname ${if def:received_protocol {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}}
+       }}}}by $primary_hostname ${if def:received_protocol {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: (helo=$sender_helo_name)
    ├──expanding: (helo=$sender_helo_name)

-       
+       

    ├─────result: (helo=)
    ├─────result: (helo=)

-       
+       

    └───skipping: result is not used
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
    └───skipping: result is not used
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)

-       }}
+       }}

   └─────result: from CALLER 
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: with $received_protocol}} (Exim $version_number)
   └─────result: from CALLER 
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: 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}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: with $received_protocol
   └─────result: with local
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)
   ├──expanding: with $received_protocol
   └─────result: with local
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)

-       }}(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_cipher)
   ├──expanding: ($tls_cipher)

-       
+       

   ├─────result: ()
   ├─────result: ()

-       
+       

   └───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ┌considering: (envelope-from <$sender_address>)
   └───skipping: result is not used
  ├──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}}

   ├──expanding: (envelope-from <$sender_address>)
   ├──expanding: (envelope-from <$sender_address>)

-       
+       

   └─────result: (envelope-from <CALLER@test.ex>)
   └─────result: (envelope-from <CALLER@test.ex>)

-       
+       

  ├──condition: def:received_for
  ├─────result: false
   ┌───scanning: 
  ├──condition: def:received_for
  ├─────result: false
   ┌───scanning: 

-       for $received_for}}
+       for $received_for}}

   ├──expanding: 
   ├──expanding: 

-       for $received_for
+       for $received_for

   ├─────result: 
   ├─────result: 

-       for 
+       for 

   └───skipping: result is not used
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
   └───skipping: result is not used
  ├──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}} (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}} (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 by the.local.host.name with local (Exim x.yz)
  └─────result: Received: from CALLER by the.local.host.name with local (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
-       id 10HmaX-0005vi-00
+       (envelope-from <CALLER@test.ex>)
+       id 10HmaX-0005vi-00

  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: ${tod_full}
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000

diff --git a/test/stderr/3000 b/test/stderr/3000
index cff64ae7bd51b4acef19e6c38ee1e5ed74d25100..a1b9f08a5ae593210dc3450b62283602179b9aa2 100644 (file)
--- a/test/stderr/3000
+++ b/test/stderr/3000
@@ -26,7 +26,7 @@ Starting Perl interpreter
   ┌considering: debug from Perl\n}}
   ├──expanding: debug from Perl\n
   └─────result: debug from Perl
   ┌considering: debug from Perl\n}}
   ├──expanding: debug from Perl\n
   └─────result: debug from Perl

-
+  

 debug from Perl
  ├──expanding: ${perl{debug_write}{debug from Perl\n}}
  └─────result: Wrote debug
 debug from Perl
  ├──expanding: ${perl{debug_write}{debug from Perl\n}}
  └─────result: Wrote debug

diff --git a/test/stderr/5410 b/test/stderr/5410
index 29b387261d830189d5ad268c2b02aae49b262640..6a37deb6ed3f256ca9164e0e8cb1a9a66dd3e563 100644 (file)
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -135,108 +135,108 @@ end of inline ACL: ACCEPT
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌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}} (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}} (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}} (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}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: from $sender_rcvhost
   ├──expanding: from $sender_rcvhost

-       
+       

   ├─────result: from 
   ├─────result: from 

-       
+       

   └───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)
   └───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}} (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}} (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}} (Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-   .┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (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
-   .└─────result: CALLER
+       }}}}by $primary_hostname ${if def:received_protocol {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}}
+   ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   ╎ }}}}by $primary_hostname ${if def:received_protocol {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: $sender_ident
+   ╎└─────result: CALLER

    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)
    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)

-       }}}}by $primary_hostname ${if def:received_protocol {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}}
+       }}}}by $primary_hostname ${if def:received_protocol {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: (helo=$sender_helo_name)
    ├──expanding: (helo=$sender_helo_name)

-       
+       

    └─────result: (helo=myhost.test.ex)
    └─────result: (helo=myhost.test.ex)

-       
+       

   ├──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)

-       }}
+       }}

   └─────result: from CALLER (helo=myhost.test.ex)
   └─────result: from CALLER (helo=myhost.test.ex)

-       
+       

  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: with $received_protocol}} (Exim $version_number)
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: 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}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)
   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)

-       }}(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_cipher)
   ├──expanding: ($tls_cipher)

-       
+       

   ├─────result: ()
   ├─────result: ()

-       
+       

   └───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ┌considering: (envelope-from <$sender_address>)
   └───skipping: result is not used
  ├──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}}

   ├──expanding: (envelope-from <$sender_address>)
   ├──expanding: (envelope-from <$sender_address>)

-       
+       

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

-       
+       

  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 
  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 

-       for $received_for}}
+       for $received_for}}

   ├──expanding: 
   ├──expanding: 

-       for $received_for
+       for $received_for

   └─────result: 
   └─────result: 

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

  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──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}} (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}} (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-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

 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}


@@ -361,108 +361,108 @@ end of inline ACL: ACCEPT
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌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}} (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}} (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}} (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}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: from $sender_rcvhost
   ├──expanding: from $sender_rcvhost

-       
+       

   ├─────result: from 
   ├─────result: from 

-       
+       

   └───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)
   └───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}} (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}} (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}} (Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-   .┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (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
-   .└─────result: CALLER
+       }}}}by $primary_hostname ${if def:received_protocol {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}}
+   ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   ╎ }}}}by $primary_hostname ${if def:received_protocol {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: $sender_ident
+   ╎└─────result: CALLER

    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)
    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)

-       }}}}by $primary_hostname ${if def:received_protocol {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}}
+       }}}}by $primary_hostname ${if def:received_protocol {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: (helo=$sender_helo_name)
    ├──expanding: (helo=$sender_helo_name)

-       
+       

    └─────result: (helo=myhost.test.ex)
    └─────result: (helo=myhost.test.ex)

-       
+       

   ├──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)

-       }}
+       }}

   └─────result: from CALLER (helo=myhost.test.ex)
   └─────result: from CALLER (helo=myhost.test.ex)

-       
+       

  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: with $received_protocol}} (Exim $version_number)
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: 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}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)
   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)

-       }}(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_cipher)
   ├──expanding: ($tls_cipher)

-       
+       

   ├─────result: ()
   ├─────result: ()

-       
+       

   └───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ┌considering: (envelope-from <$sender_address>)
   └───skipping: result is not used
  ├──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}}

   ├──expanding: (envelope-from <$sender_address>)
   ├──expanding: (envelope-from <$sender_address>)

-       
+       

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

-       
+       

  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 
  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 

-       for $received_for}}
+       for $received_for}}

   ├──expanding: 
   ├──expanding: 

-       for $received_for
+       for $received_for

   └─────result: 
   └─────result: 

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

  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──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}} (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}} (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-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

 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}


@@ -587,108 +587,108 @@ end of inline ACL: ACCEPT
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌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}} (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}} (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}} (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}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: from $sender_rcvhost
   ├──expanding: from $sender_rcvhost

-       
+       

   ├─────result: from 
   ├─────result: from 

-       
+       

   └───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)
   └───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}} (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}} (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}} (Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-   .┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (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
-   .└─────result: CALLER
+       }}}}by $primary_hostname ${if def:received_protocol {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}}
+   ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   ╎ }}}}by $primary_hostname ${if def:received_protocol {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: $sender_ident
+   ╎└─────result: CALLER

    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)
    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)

-       }}}}by $primary_hostname ${if def:received_protocol {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}}
+       }}}}by $primary_hostname ${if def:received_protocol {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: (helo=$sender_helo_name)
    ├──expanding: (helo=$sender_helo_name)

-       
+       

    └─────result: (helo=myhost.test.ex)
    └─────result: (helo=myhost.test.ex)

-       
+       

   ├──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)

-       }}
+       }}

   └─────result: from CALLER (helo=myhost.test.ex)
   └─────result: from CALLER (helo=myhost.test.ex)

-       
+       

  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: with $received_protocol}} (Exim $version_number)
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: 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}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)
   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)

-       }}(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_cipher)
   ├──expanding: ($tls_cipher)

-       
+       

   ├─────result: ()
   ├─────result: ()

-       
+       

   └───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ┌considering: (envelope-from <$sender_address>)
   └───skipping: result is not used
  ├──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}}

   ├──expanding: (envelope-from <$sender_address>)
   ├──expanding: (envelope-from <$sender_address>)

-       
+       

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

-       
+       

  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 
  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 

-       for $received_for}}
+       for $received_for}}

   ├──expanding: 
   ├──expanding: 

-       for $received_for
+       for $received_for

   └─────result: 
   └─────result: 

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

  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──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}} (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}} (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-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

 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}

diff --git a/test/stderr/5420 b/test/stderr/5420
index 36ac19bb4dbdc6bf16c69a5ce9d175a99d10e951..eaa40bce89b2facb1213230db573b4546eb5ca68 100644 (file)
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -134,108 +134,108 @@ end of inline ACL: ACCEPT
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌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}} (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}} (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}} (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}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: from $sender_rcvhost
   ├──expanding: from $sender_rcvhost

-       
+       

   ├─────result: from 
   ├─────result: from 

-       
+       

   └───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)
   └───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}} (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}} (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}} (Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-   .┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (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
-   .└─────result: CALLER
+       }}}}by $primary_hostname ${if def:received_protocol {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}}
+   ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   ╎ }}}}by $primary_hostname ${if def:received_protocol {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: $sender_ident
+   ╎└─────result: CALLER

    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)
    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)

-       }}}}by $primary_hostname ${if def:received_protocol {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}}
+       }}}}by $primary_hostname ${if def:received_protocol {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: (helo=$sender_helo_name)
    ├──expanding: (helo=$sender_helo_name)

-       
+       

    └─────result: (helo=myhost.test.ex)
    └─────result: (helo=myhost.test.ex)

-       
+       

   ├──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)

-       }}
+       }}

   └─────result: from CALLER (helo=myhost.test.ex)
   └─────result: from CALLER (helo=myhost.test.ex)

-       
+       

  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: with $received_protocol}} (Exim $version_number)
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: 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}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)
   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)

-       }}(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_cipher)
   ├──expanding: ($tls_cipher)

-       
+       

   ├─────result: ()
   ├─────result: ()

-       
+       

   └───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ┌considering: (envelope-from <$sender_address>)
   └───skipping: result is not used
  ├──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}}

   ├──expanding: (envelope-from <$sender_address>)
   ├──expanding: (envelope-from <$sender_address>)

-       
+       

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

-       
+       

  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 
  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 

-       for $received_for}}
+       for $received_for}}

   ├──expanding: 
   ├──expanding: 

-       for $received_for
+       for $received_for

   └─────result: 
   └─────result: 

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

  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──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}} (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}} (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-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

 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}


@@ -360,108 +360,108 @@ end of inline ACL: ACCEPT
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌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}} (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}} (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}} (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}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: from $sender_rcvhost
   ├──expanding: from $sender_rcvhost

-       
+       

   ├─────result: from 
   ├─────result: from 

-       
+       

   └───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)
   └───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}} (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}} (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}} (Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-   .┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (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
-   .└─────result: CALLER
+       }}}}by $primary_hostname ${if def:received_protocol {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}}
+   ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   ╎ }}}}by $primary_hostname ${if def:received_protocol {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: $sender_ident
+   ╎└─────result: CALLER

    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)
    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)

-       }}}}by $primary_hostname ${if def:received_protocol {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}}
+       }}}}by $primary_hostname ${if def:received_protocol {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: (helo=$sender_helo_name)
    ├──expanding: (helo=$sender_helo_name)

-       
+       

    └─────result: (helo=myhost.test.ex)
    └─────result: (helo=myhost.test.ex)

-       
+       

   ├──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)

-       }}
+       }}

   └─────result: from CALLER (helo=myhost.test.ex)
   └─────result: from CALLER (helo=myhost.test.ex)

-       
+       

  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: with $received_protocol}} (Exim $version_number)
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: 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}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)
   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)

-       }}(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_cipher)
   ├──expanding: ($tls_cipher)

-       
+       

   ├─────result: ()
   ├─────result: ()

-       
+       

   └───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ┌considering: (envelope-from <$sender_address>)
   └───skipping: result is not used
  ├──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}}

   ├──expanding: (envelope-from <$sender_address>)
   ├──expanding: (envelope-from <$sender_address>)

-       
+       

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

-       
+       

  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 
  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 

-       for $received_for}}
+       for $received_for}}

   ├──expanding: 
   ├──expanding: 

-       for $received_for
+       for $received_for

   └─────result: 
   └─────result: 

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

  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──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}} (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}} (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-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

 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}


@@ -586,108 +586,108 @@ end of inline ACL: ACCEPT
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──expanding: ${tod_full}
  └─────result: Tue, 2 Mar 1999 09:44:33 +0000
  ┌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}} (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}} (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}} (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}} (Exim $version_number)
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: from $sender_rcvhost
   ├──expanding: from $sender_rcvhost

-       
+       

   ├─────result: from 
   ├─────result: from 

-       
+       

   └───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)
   └───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}} (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}} (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}} (Exim $version_number)
-       ${if def:sender_address {(envelope-from <$sender_address>)
-       }}id $message_exim_id${if def:received_for {
-       for $received_for}}
-   .┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
-       }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} (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
-   .└─────result: CALLER
+       }}}}by $primary_hostname ${if def:received_protocol {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}}
+   ╎┌considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
+   ╎ }}}}by $primary_hostname ${if def:received_protocol {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: $sender_ident
+   ╎└─────result: CALLER

    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)
    ├──expanding: from ${quote_local_part:$sender_ident} 
    └─────result: from CALLER 
   ├──condition: def:sender_helo_name
   ├─────result: true
    ┌considering: (helo=$sender_helo_name)

-       }}}}by $primary_hostname ${if def:received_protocol {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}}
+       }}}}by $primary_hostname ${if def:received_protocol {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: (helo=$sender_helo_name)
    ├──expanding: (helo=$sender_helo_name)

-       
+       

    └─────result: (helo=myhost.test.ex)
    └─────result: (helo=myhost.test.ex)

-       
+       

   ├──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)

-       }}
+       }}

   └─────result: from CALLER (helo=myhost.test.ex)
   └─────result: from CALLER (helo=myhost.test.ex)

-       
+       

  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: with $received_protocol}} (Exim $version_number)
  ├──condition: def:received_protocol
  ├─────result: true
   ┌considering: 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}}
+       ${if def:sender_address {(envelope-from <$sender_address>)
+       }}id $message_exim_id${if def:received_for {
+       for $received_for}}

   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)
   ├──expanding: with $received_protocol
   └─────result: with local-esmtp
  ├──condition: def:tls_cipher
  ├─────result: false
   ┌───scanning: ($tls_cipher)

-       }}(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_cipher)
   ├──expanding: ($tls_cipher)

-       
+       

   ├─────result: ()
   ├─────result: ()

-       
+       

   └───skipping: result is not used
  ├──condition: def:sender_address
  ├─────result: true
   ┌considering: (envelope-from <$sender_address>)
   └───skipping: result is not used
  ├──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}}

   ├──expanding: (envelope-from <$sender_address>)
   ├──expanding: (envelope-from <$sender_address>)

-       
+       

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

-       
+       

  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 
  ├──condition: def:received_for
  ├─────result: true
   ┌considering: 

-       for $received_for}}
+       for $received_for}}

   ├──expanding: 
   ├──expanding: 

-       for $received_for
+       for $received_for

   └─────result: 
   └─────result: 

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

  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  ├──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}} (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}} (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-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

 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}
 ----------- start cutthrough headers send -----------
 ----------- done cutthrough headers send ------------
  ┌considering: ${tod_full}