Debug: more detail for expansion items

6 files changed, 142 insertions, 0 deletions

diff --git a/test/stderr/0002 b/test/stderr/0002
index 81108f28f..94f47c29b 100644
--- a/test/stderr/0002
+++ b/test/stderr/0002
@@ -33,6 +33,7 @@ dropping to exim gid; retaining priv uid
   ├considering: }fail}
   ├──expanding: $2$1
   ╰─────result: cdab
+ ├───item-res: cdab
  ├──expanding: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
  ╰─────result: match:  cdab
  ╭considering: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
@@ -124,6 +125,7 @@ LOG: MAIN PANIC
   ├considering: }}
   ├──expanding: no
   ╰─────result: no
+ ├───item-res: no
  ├──expanding: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
  ╰─────result: match_address:   no
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -156,6 +158,7 @@ dropping to exim gid; retaining priv uid
   |considering: }fail}
   |--expanding: $2$1
   \_____result: cdab
+ |---item-res: cdab
  |--expanding: match:  ${if match{abcd}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
  \_____result: match:  cdab
  /considering: match:  ${if match{wxyz}{\N^([ab]+)(\w+)$\N}{$2$1}fail}
@@ -247,6 +250,7 @@ LOG: MAIN PANIC
   |considering: }}
   |--expanding: no
   \_____result: no
+ |---item-res: no
  |--expanding: match_address:   ${if match_address{a.b.c}{a.b.c}{yes}{no}}
  \_____result: match_address:   no
 >>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
@@ -383,6 +387,7 @@ dropping to exim gid; retaining priv uid
   ├considering: }}
   ├──expanding: No
   ╰─────result: No
+ ├───item-res: No
  ├──expanding: ----> No lookup yet: ${if eq{black}{white}{$sender_host_name}{No}}
  ╰─────result: ----> No lookup yet: No
  ╭considering: -oMs  sender_host_name = $sender_host_name
diff --git a/test/stderr/0092 b/test/stderr/0092
index c2bfdd759..6fa174dc3 100644
--- a/test/stderr/0092
+++ b/test/stderr/0092
@@ -73,6 +73,7 @@ set_process_info: pppp handling incoming connection from [V4NET.0.0.1]
   ├──expanding: 30
   ├─────result: 30
   ╰───skipping: result is not used
+ ├───item-res: 2
  ├considering: s
  ├───────text: s
  ├──expanding: ${if eq {V4NET.0.0.1} {$sender_host_address} {2} {30}}s
diff --git a/test/stderr/0402 b/test/stderr/0402
index 92b6e9489..33b08659c 100644
--- a/test/stderr/0402
+++ b/test/stderr/0402
@@ -143,6 +143,7 @@ Data file written for message 10HmaX-0005vi-00
    	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)
@@ -182,6 +183,7 @@ Data file written for message 10HmaX-0005vi-00
    ├─────result: (helo=)
    	
    ╰───skipping: result is not used
+  ├───item-res: 
   ├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>)
@@ -190,6 +192,7 @@ Data file written for message 10HmaX-0005vi-00
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
   	}}
   ╰─────result: from CALLER 
+ ├───item-res: from CALLER 
  ├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>)
@@ -238,6 +241,7 @@ Data file written for message 10HmaX-0005vi-00
   	for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local 
+ ├───item-res: with local 
  ├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>)
@@ -248,6 +252,7 @@ Data file written for message 10HmaX-0005vi-00
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
   ╰───skipping: result is not used
+ ├───item-res: 
  ├considering: ${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -282,6 +287,7 @@ Data file written for message 10HmaX-0005vi-00
   ├─────result:  tls 
   	
   ╰───skipping: result is not used
+ ├───item-res: 
  ├considering: (Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
  	}}id $message_exim_id${if def:received_for {
@@ -320,6 +326,8 @@ Data file written for message 10HmaX-0005vi-00
   	
   ╰─────result: (envelope-from <CALLER@test.ex>)
   	
+ ├───item-res: (envelope-from <CALLER@test.ex>)
+ 	
  ├considering: id $message_exim_id${if def:received_for {
  	for $received_for}}
  ├───────text: id 
@@ -340,6 +348,7 @@ Data file written for message 10HmaX-0005vi-00
   ├─────result: 
   	for 
   ╰───skipping: result is not used
+ ├───item-res: 
  ├──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
@@ -704,6 +713,8 @@ writing to file TESTSUITE/test-mail/junk
   ├──expanding: MAILER-DAEMON
   ├─────result: MAILER-DAEMON
   ╰───skipping: result is not used
+ ├───item-res: CALLER@test.ex
+            ╰──(tainted)
  ├considering:  ${tod_bsdinbox}
  
  ├───────text:  
@@ -780,6 +791,8 @@ writing to file TESTSUITE/test-mail/junk
   ├──expanding: MAILER-DAEMON
   ├─────result: MAILER-DAEMON
   ╰───skipping: result is not used
+ ├───item-res: CALLER@test.ex
+            ╰──(tainted)
  ├considering:  ${tod_bsdinbox}
  
  ├───────text:  
diff --git a/test/stderr/0544 b/test/stderr/0544
index 40751acc5..c5e4ac7cc 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -108,6 +108,7 @@ admin user
    	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)
@@ -147,6 +148,7 @@ admin user
    ├─────result: (helo=)
    	
    ╰───skipping: result is not used
+  ├───item-res: 
   ├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>)
@@ -155,6 +157,7 @@ admin user
   ├──expanding: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name)
   	}}
   ╰─────result: from CALLER 
+ ├───item-res: from CALLER 
  ├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>)
@@ -203,6 +206,7 @@ admin user
   	for $received_for}}
   ├──expanding: with $received_protocol 
   ╰─────result: with local 
+ ├───item-res: with local 
  ├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>)
@@ -213,6 +217,7 @@ admin user
   ├──expanding:  ($tls_in_ver)
   ├─────result:  ()
   ╰───skipping: result is not used
+ ├───item-res: 
  ├considering: ${if def:tls_in_cipher_std { tls $tls_in_cipher_std
  	}}(Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
@@ -247,6 +252,7 @@ admin user
   ├─────result:  tls 
   	
   ╰───skipping: result is not used
+ ├───item-res: 
  ├considering: (Exim $version_number)
  	${if def:sender_address {(envelope-from <$sender_address>)
  	}}id $message_exim_id${if def:received_for {
@@ -285,6 +291,8 @@ admin user
   	
   ╰─────result: (envelope-from <CALLER@test.ex>)
   	
+ ├───item-res: (envelope-from <CALLER@test.ex>)
+ 	
  ├considering: id $message_exim_id${if def:received_for {
  	for $received_for}}
  ├───────text: id 
@@ -305,6 +313,7 @@ admin user
   ├─────result: 
   	for 
   ╰───skipping: result is not used
+ ├───item-res: 
  ├──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
diff --git a/test/stderr/5410 b/test/stderr/5410
index 990fac898..99a829e2b 100644
--- a/test/stderr/5410
+++ b/test/stderr/5410
@@ -270,6 +270,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)
@@ -309,6 +310,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>)
@@ -319,6 +323,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>)
@@ -367,6 +374,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>)
@@ -377,6 +386,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>)
@@ -411,6 +422,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 {
@@ -449,6 +462,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 
@@ -469,6 +485,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
@@ -735,6 +754,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)
@@ -774,6 +794,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>)
@@ -784,6 +807,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>)
@@ -832,6 +858,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>)
@@ -842,6 +870,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>)
@@ -876,6 +906,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 {
@@ -914,6 +946,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 
@@ -934,6 +969,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
@@ -1200,6 +1238,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)
@@ -1239,6 +1278,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>)
@@ -1249,6 +1291,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>)
@@ -1297,6 +1342,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>)
@@ -1307,6 +1354,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>)
@@ -1341,6 +1390,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 {
@@ -1379,6 +1430,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 
@@ -1399,6 +1453,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
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