X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1058096b8c5317376c1df7473f6ca7c543d20715..5800e3234f2594639d82e5063d9c522c6a881d25:/test/stderr/5410

diff --git a/test/stderr/5410 b/test/stderr/5410
index 990fac898..8599c878a 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
@@ -494,6 +513,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:STARTTLS:220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
@@ -735,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)
@@ -774,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>)
@@ -784,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>)
@@ -832,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>)
@@ -842,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>)
@@ -876,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 {
@@ -914,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 
@@ -934,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
@@ -959,6 +998,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss
@@ -1200,6 +1240,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 +1280,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 +1293,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 +1344,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 +1356,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 +1392,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 +1432,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 +1455,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
@@ -1424,6 +1483,7 @@ LOG: MAIN
   SMTP>> QUIT
   SMTP<< 221 myhost.test.ex closing connection
   SMTP(close)>>
+cmdlog: '220:EHLO:250-:MAIL|:RCPT:250:250:DATA:354:250:QUIT:221'
 ----------- cutthrough shutdown (delivered) ------------
 LOG: MAIN
   <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss