Debug: more detail for expansion items

1 files changed, 57 insertions, 0 deletions

diff --git a/test/stderr/5420 b/test/stderr/5420
index 7ac360377..ff97dbbc7 100644
--- a/test/stderr/5420
+++ b/test/stderr/5420
@@ -271,6 +271,7 @@ end of inline ACL: ACCEPT
    	for $received_for}}
    ├──expanding: from ${quote_local_part:$sender_ident} 
    ╰─────result: from CALLER 
+  ├───item-res: from CALLER 
   ├considering: ${if def:sender_helo_name {(helo=$sender_helo_name)
   	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
   	}}(Exim $version_number)
@@ -310,6 +311,9 @@ end of inline ACL: ACCEPT
    ╰─────result: (helo=myhost.test.ex)
    	
               ╰──(tainted)
+  ├───item-res: (helo=myhost.test.ex)
+  	
+             ╰──(tainted)
   ├considering: }}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
   	}}(Exim $version_number)
   	${if def:sender_address {(envelope-from <$sender_address>)
@@ -320,6 +324,9 @@ end of inline ACL: ACCEPT
   ╰─────result: from CALLER (helo=myhost.test.ex)
   	
              ╰──(tainted)
+ ├───item-res: from CALLER (helo=myhost.test.ex)
+ 	
+            ╰──(tainted)
  ├considering: by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -368,6 +375,8 @@ end of inline ACL: ACCEPT
   	for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├───item-res: with local-esmtp 
+            ╰──(tainted)
  ├considering: ${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -378,6 +387,8 @@ end of inline ACL: ACCEPT
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
   ╰───skipping: result is not used
+ ├───item-res: 
+            ╰──(tainted)
  ├considering: ${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -412,6 +423,8 @@ end of inline ACL: ACCEPT
   ├─────result:  tls 
   	
   ╰───skipping: result is not used
+ ├───item-res: 
+            ╰──(tainted)
  ├considering: (Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
  	}}id $message_exim_id${if def:received_for {
@@ -450,6 +463,9 @@ end of inline ACL: ACCEPT
   	
   ╰─────result: (envelope-from <CALLER@myhost.test.ex>)
   	
+ ├───item-res: (envelope-from <CALLER@myhost.test.ex>)
+ 	
+            ╰──(tainted)
  ├considering: id $message_exim_id${if def:received_for {
  	for $received_for}}
  ├───────text: id 
@@ -470,6 +486,9 @@ end of inline ACL: ACCEPT
   ╰─────result: 
   	for userx@domain.com
              ╰──(tainted)
+ ├───item-res: 
+ 	for userx@domain.com
+            ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  	}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
  	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
@@ -736,6 +755,7 @@ end of inline ACL: ACCEPT
    	for $received_for}}
    ├──expanding: from ${quote_local_part:$sender_ident} 
    ╰─────result: from CALLER 
+  ├───item-res: from CALLER 
   ├considering: ${if def:sender_helo_name {(helo=$sender_helo_name)
   	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
   	}}(Exim $version_number)
@@ -775,6 +795,9 @@ end of inline ACL: ACCEPT
    ╰─────result: (helo=myhost.test.ex)
    	
               ╰──(tainted)
+  ├───item-res: (helo=myhost.test.ex)
+  	
+             ╰──(tainted)
   ├considering: }}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
   	}}(Exim $version_number)
   	${if def:sender_address {(envelope-from <$sender_address>)
@@ -785,6 +808,9 @@ end of inline ACL: ACCEPT
   ╰─────result: from CALLER (helo=myhost.test.ex)
   	
              ╰──(tainted)
+ ├───item-res: from CALLER (helo=myhost.test.ex)
+ 	
+            ╰──(tainted)
  ├considering: by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -833,6 +859,8 @@ end of inline ACL: ACCEPT
   	for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├───item-res: with local-esmtp 
+            ╰──(tainted)
  ├considering: ${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -843,6 +871,8 @@ end of inline ACL: ACCEPT
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
   ╰───skipping: result is not used
+ ├───item-res: 
+            ╰──(tainted)
  ├considering: ${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -877,6 +907,8 @@ end of inline ACL: ACCEPT
   ├─────result:  tls 
   	
   ╰───skipping: result is not used
+ ├───item-res: 
+            ╰──(tainted)
  ├considering: (Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
  	}}id $message_exim_id${if def:received_for {
@@ -915,6 +947,9 @@ end of inline ACL: ACCEPT
   	
   ╰─────result: (envelope-from <CALLER@myhost.test.ex>)
   	
+ ├───item-res: (envelope-from <CALLER@myhost.test.ex>)
+ 	
+            ╰──(tainted)
  ├considering: id $message_exim_id${if def:received_for {
  	for $received_for}}
  ├───────text: id 
@@ -935,6 +970,9 @@ end of inline ACL: ACCEPT
   ╰─────result: 
   	for usery@domain.com
              ╰──(tainted)
+ ├───item-res: 
+ 	for usery@domain.com
+            ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  	}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
  	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
@@ -1201,6 +1239,7 @@ end of inline ACL: ACCEPT
    	for $received_for}}
    ├──expanding: from ${quote_local_part:$sender_ident} 
    ╰─────result: from CALLER 
+  ├───item-res: from CALLER 
   ├considering: ${if def:sender_helo_name {(helo=$sender_helo_name)
   	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
   	}}(Exim $version_number)
@@ -1240,6 +1279,9 @@ end of inline ACL: ACCEPT
    ╰─────result: (helo=myhost.test.ex)
    	
               ╰──(tainted)
+  ├───item-res: (helo=myhost.test.ex)
+  	
+             ╰──(tainted)
   ├considering: }}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
   	}}(Exim $version_number)
   	${if def:sender_address {(envelope-from <$sender_address>)
@@ -1250,6 +1292,9 @@ end of inline ACL: ACCEPT
   ╰─────result: from CALLER (helo=myhost.test.ex)
   	
              ╰──(tainted)
+ ├───item-res: from CALLER (helo=myhost.test.ex)
+ 	
+            ╰──(tainted)
  ├considering: by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -1298,6 +1343,8 @@ end of inline ACL: ACCEPT
   	for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local-esmtp 
+ ├───item-res: with local-esmtp 
+            ╰──(tainted)
  ├considering: ${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -1308,6 +1355,8 @@ end of inline ACL: ACCEPT
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
   ╰───skipping: result is not used
+ ├───item-res: 
+            ╰──(tainted)
  ├considering: ${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -1342,6 +1391,8 @@ end of inline ACL: ACCEPT
   ├─────result:  tls 
   	
   ╰───skipping: result is not used
+ ├───item-res: 
+            ╰──(tainted)
  ├considering: (Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
  	}}id $message_exim_id${if def:received_for {
@@ -1380,6 +1431,9 @@ end of inline ACL: ACCEPT
   	
   ╰─────result: (envelope-from <CALLER@myhost.test.ex>)
   	
+ ├───item-res: (envelope-from <CALLER@myhost.test.ex>)
+ 	
+            ╰──(tainted)
  ├considering: id $message_exim_id${if def:received_for {
  	for $received_for}}
  ├───────text: id 
@@ -1400,6 +1454,9 @@ end of inline ACL: ACCEPT
   ╰─────result: 
   	for usery@domain.com
              ╰──(tainted)
+ ├───item-res: 
+ 	for usery@domain.com
+            ╰──(tainted)
  ├──expanding: Received: ${if def:sender_rcvhost {from $sender_rcvhost
  	}{${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
  	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${if def:tls_in_ver        { ($tls_in_ver)}}${if def:tls_in_cipher_std { tls $tls_in_cipher_std