X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e47376befc6e4a415319e3c29fad9b0ba2bbd8ee..d945e180cbe2b26392fb21f7ae4dd2ccc603a81b:/test/stderr/0544

diff --git a/test/stderr/0544 b/test/stderr/0544
index a95583ab7..3e5fbe13e 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -1,187 +1,533 @@
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
-considering: ${tod_full}
-  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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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
-	}{${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_cipher {($tls_cipher)
-	}}(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
-	
-     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)
-	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-	}}(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)
-	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-	}}(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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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)
-	}}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-	}}(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)
-	
-     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)
-	}}
-     result: from CALLER 
-condition: def:received_protocol
-   result: true
-considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher)
-	}}(Exim $version_number)
-	${if def:sender_address {(envelope-from <$sender_address>)
-	}}id $message_exim_id${if def:received_for {
-	for $received_for}}
-  expanding: with $received_protocol
-     result: with local
-condition: def:sender_address
-   result: true
-considering: (envelope-from <$sender_address>)
-	}}id $message_exim_id${if def:received_for {
-	for $received_for}}
-  expanding: (envelope-from <$sender_address>)
-	
-     result: (envelope-from <CALLER@test.ex>)
-	
-condition: def:received_for
-   result: false
-   scanning: 
-	for $received_for}}
-  expanding: 
-	for $received_for
-     result: 
-	for 
-   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}} ${if def:tls_cipher {($tls_cipher)
-	}}(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)
-	(envelope-from <CALLER@test.ex>)
-	id 10HmaX-0005vi-00
-considering: ${tod_full}
-  expanding: ${tod_full}
-     result: Tue, 2 Mar 1999 09:44:33 +0000
+try option gecos_pattern
+try option gecos_name
+try option unknown_login
+try option smtp_active_hostname
+try option message_size_limit
+try option acl_not_smtp_start
+try option message_id_header_domain
+try option message_id_header_text
+ ╭considering: ${tod_full}
+ ├───expanded: ${tod_full}
+ ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
+try option received_header_text
+ ╭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░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ 	}}(Exim░$version_number)↩
+ 	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├───────text: Received:░
+ ├considering: ${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↩
+ 	}}(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↩
+  	}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───────text: from░
+  ├───scanning: $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↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├──────value: 
+  ├───scanning: ↩
+  	}{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───────text: ↩
+  	
+  ├───scanning: }{${if░def:sender_ident░{from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+  	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───expanded: from░$sender_rcvhost↩
+  	
+  ├─────result:  ◀skipped▶
+  ╰───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░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├──condition: def:sender_ident
+  ├─────result: true
+   ╭considering: from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+   	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   	}}(Exim░$version_number)↩
+   	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   	}}id░$message_exim_id${if░def:received_for░{↩
+   	for░$received_for}}
+   ├───────text: from░
+   ├considering: ${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+   	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   	}}(Exim░$version_number)↩
+   	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   	}}id░$message_exim_id${if░def:received_for░{↩
+   	for░$received_for}}
+   ╎╭considering: $sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩
+   ╎	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   ╎	}}(Exim░$version_number)↩
+   ╎	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ╎	}}id░$message_exim_id${if░def:received_for░{↩
+   ╎	for░$received_for}}
+   ╎├──────value: 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)↩
+   ╎	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   ╎	}}id░$message_exim_id${if░def:received_for░{↩
+   ╎	for░$received_for}}
+   ╎├───expanded: $sender_ident
+   ╎╰─────result: CALLER
+   ├─────op-res: 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)↩
+   	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   	}}id░$message_exim_id${if░def:received_for░{↩
+   	for░$received_for}}
+   ├───────text: ░
+   ├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)↩
+   	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   	}}id░$message_exim_id${if░def:received_for░{↩
+   	for░$received_for}}
+   ├───expanded: 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)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├──condition: def:sender_helo_name
+  ├─────result: false
+   ╭───scanning: (helo=$sender_helo_name)↩
+   	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   	}}(Exim░$version_number)↩
+   	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   	}}id░$message_exim_id${if░def:received_for░{↩
+   	for░$received_for}}
+   ├───────text: (helo=
+   ├───scanning: $sender_helo_name)↩
+   	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   	}}(Exim░$version_number)↩
+   	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   	}}id░$message_exim_id${if░def:received_for░{↩
+   	for░$received_for}}
+   ├──────value: 
+   ├───scanning: )↩
+   	}}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   	}}(Exim░$version_number)↩
+   	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   	}}id░$message_exim_id${if░def:received_for░{↩
+   	for░$received_for}}
+   ├───────text: )↩
+   	
+   ├───scanning: }}}}by░$primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+   	}}(Exim░$version_number)↩
+   	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+   	}}id░$message_exim_id${if░def:received_for░{↩
+   	for░$received_for}}
+   ├───expanded: (helo=$sender_helo_name)↩
+   	
+   ├─────result:  ◀skipped▶
+   ╰───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>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───expanded: ${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>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├───────text: by░
+ ├considering: $primary_hostname░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ 	}}(Exim░$version_number)↩
+ 	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├──────value: the.local.host.name
+ ├considering: ░${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ 	}}(Exim░$version_number)↩
+ 	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├───────text: ░
+ ├considering: ${if░def:received_protocol░{with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+ 	}}(Exim░$version_number)↩
+ 	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├──condition: def:received_protocol
+ ├─────result: true
+  ╭considering: with░$received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───────text: with░
+  ├considering: $received_protocol░}}${if░def:tls_in_ver░░░░░░░░{░($tls_in_ver)}}${if░def:tls_in_cipher_std░{░tls░$tls_in_cipher_std↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├──────value: 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>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───────text: ░
+  ├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>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───expanded: 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>)↩
+ 	}}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}}
+  ├───expanded: ░($tls_in_ver)
+  ├─────result:  ◀skipped▶
+  ╰───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>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├──condition: def:tls_in_cipher_std
+ ├─────result: false
+  ╭───scanning: ░tls░$tls_in_cipher_std↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───────text: ░tls░
+  ├───scanning: $tls_in_cipher_std↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├──────value: 
+  ├───scanning: ↩
+  	}}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───────text: ↩
+  	
+  ├───scanning: }}(Exim░$version_number)↩
+  	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───expanded: ░tls░$tls_in_cipher_std↩
+  	
+  ├─────result:  ◀skipped▶
+  ╰───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░{↩
+ 	for░$received_for}}
+ ├───────text: (Exim░
+ ├considering: $version_number)↩
+ 	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├──────value: x.yz
+ ├considering: )↩
+ 	${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├───────text: )↩
+ 	
+ ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩
+ 	}}id░$message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├──condition: def:sender_address
+ ├─────result: true
+  ╭considering: (envelope-from░<$sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───────text: (envelope-from░<
+  ├considering: $sender_address>)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├──────value: CALLER@test.ex
+  ├considering: >)↩
+  	}}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───────text: >)↩
+  	
+  ├considering: }}id░$message_exim_id${if░def:received_for░{↩
+  	for░$received_for}}
+  ├───expanded: (envelope-from░<$sender_address>)↩
+  	
+  ╰─────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░
+ ├considering: $message_exim_id${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├──────value: 10HmaX-000000005vi-0000
+ ├considering: ${if░def:received_for░{↩
+ 	for░$received_for}}
+ ├──condition: def:received_for
+ ├─────result: false
+  ╭───scanning: ↩
+  	for░$received_for}}
+  ├───────text: ↩
+  	for░
+  ├───scanning: $received_for}}
+  ├──────value: 
+  ├───scanning: }}
+  ├───expanded: ↩
+  	for░$received_for
+  ├─────result:  ◀skipped▶
+  ╰───skipping: result is not used
+ ├───item-res: 
+ ├───expanded: 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↩
+ 	}}(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)↩
+ 	(envelope-from░<CALLER@test.ex>)↩
+ 	id░10HmaX-000000005vi-0000
+try option acl_not_smtp
+ ╭considering: ${tod_full}
+ ├───expanded: ${tod_full}
+ ╰─────result: Tue,░2░Mar░1999░09:44:33░+0000
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-considering: $domain
-  expanding: $domain
-     result: domain1.ex
+dropping to exim gid; retaining priv uid
+try option router_home_directory
+try option set
+try option transport
+try option unseen
+try option unseen
+try option router_home_directory
+try option set
+try option transport
+try option unseen
+try option unseen
+try option multi_domain
+try option multi_domain
+try option max_parallel
+try option return_path
+ ╭considering: $domain
+ ├──────value: domain1.ex
+            ╰──(tainted)
+ ├───expanded: $domain
+ ╰─────result: domain1.ex
+            ╰──(tainted)
 LOG: MAIN
-  == userx@domain1.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
+  == userx@domain1.ex R=smarthost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue
 LOG: MAIN
-  == userx@domain2.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
-considering: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-considering: $h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: $h_list-id:$h_list-post:$h_list-subscribe:
-     result: 
-considering: } }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: 
-     result: 
-considering: $h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: $h_precedence:
-     result: 
-considering: (?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: (?i)bulk|list|junk
-     result: (?i)bulk|list|junk
-considering: $h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: $h_auto-submitted:
-     result: 
-considering: (?i)auto-generated|auto-replied} }} {no}{yes}}
-  expanding: (?i)auto-generated|auto-replied
-     result: (?i)auto-generated|auto-replied
-condition: or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }}
-   result: false
-   scanning: no}{yes}}
-  expanding: no
-     result: no
-   skipping: result is not used
-considering: yes}}
-  expanding: yes
-     result: yes
-  expanding: ${if or {{ !eq{$h_list-id:$h_list-post:$h_list-subscribe:}{} }{ match{$h_precedence:}{(?i)bulk|list|junk} }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}}
-     result: yes
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  == userx@domain2.ex R=smarthost T=smtp defer (-1): first-pass only routing due to -odqs, queue_smtp_domains or control=queue
+try option delay_warning_condition
+ ╭considering: ${if░or░{{░!eq{$h_list-id:$h_list-post:$h_list-subscribe:}{}░}{░match{$h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ╭considering: $h_list-id:$h_list-post:$h_list-subscribe:}{}░}{░match{$h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├considering: $h_list-post:$h_list-subscribe:}{}░}{░match{$h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├considering: $h_list-subscribe:}{}░}{░match{$h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├considering: }{}░}{░match{$h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├───expanded: $h_list-id:$h_list-post:$h_list-subscribe:
+  ╰─────result: 
+  ╭considering: }░}{░match{$h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├───expanded: 
+  ╰─────result: 
+  ╭considering: $h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├considering: }{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├───expanded: $h_precedence:
+  ╰─────result: 
+  ╭considering: (?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├───────text: (?i)bulk|list|junk
+  ├considering: }░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├───expanded: (?i)bulk|list|junk
+  ╰─────result: (?i)bulk|list|junk
+ compiled RE '(?i)bulk|list|junk' not found in local cache
+ compiling RE '(?i)bulk|list|junk'
+ compiled RE '(?i)bulk|list|junk' saved in local cache
+  ╭considering: $h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├considering: }{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├───expanded: $h_auto-submitted:
+  ╰─────result: 
+  ╭considering: (?i)auto-generated|auto-replied}░}}░{no}{yes}}
+  ├───────text: (?i)auto-generated|auto-replied
+  ├considering: }░}}░{no}{yes}}
+  ├───expanded: (?i)auto-generated|auto-replied
+  ╰─────result: (?i)auto-generated|auto-replied
+ compiled RE '(?i)auto-generated|auto-replied' not found in local cache
+ compiling RE '(?i)auto-generated|auto-replied'
+ compiled RE '(?i)auto-generated|auto-replied' saved in local cache
+ ├──condition: or░{{░!eq{$h_list-id:$h_list-post:$h_list-subscribe:}{}░}{░match{$h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}
+ ├─────result: false
+  ╭───scanning: no}{yes}}
+  ├───────text: no
+  ├───scanning: }{yes}}
+  ├───expanded: no
+  ├─────result:  ◀skipped▶
+  ╰───skipping: result is not used
+  ╭considering: yes}}
+  ├───────text: yes
+  ├considering: }}
+  ├───expanded: yes
+  ╰─────result: yes
+ ├───expanded: ${if░or░{{░!eq{$h_list-id:$h_list-post:$h_list-subscribe:}{}░}{░match{$h_precedence:}{(?i)bulk|list|junk}░}{░match{$h_auto-submitted:}{(?i)auto-generated|auto-replied}░}}░{no}{yes}}
+ ╰─────result: yes
+>>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>>
+>>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
+environment after trimming:
+ PATH=<munged>
+adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 configuration file is TESTSUITE/test-config
 admin user
+try option gecos_pattern
+try option gecos_name
+try option unknown_login
+try option smtp_active_hostname
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full
-  expanding: $smtp_active_hostname ESMTP Exim $version_number $tod_full
-     result: the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
-considering: ${if match_domain {$sender_helo_name}{+dlist}}
-considering: $sender_helo_name}{+dlist}}
-  expanding: $sender_helo_name
-     result: ehlo.domain
-considering: +dlist}}
-  expanding: +dlist
-     result: +dlist
-considering: $domain
-  expanding: $domain
-     result: ehlo.domain
-condition: match_domain {$sender_helo_name}{+dlist}
-   result: true
-  expanding: ${if match_domain {$sender_helo_name}{+dlist}}
-     result: true
-considering: domain=$domain/sender_domain=$sender_address_domain
-  expanding: domain=$domain/sender_domain=$sender_address_domain
-     result: domain=/sender_domain=sender.domain
-considering: domain=$domain/sender_domain=$sender_address_domain
-  expanding: domain=$domain/sender_domain=$sender_address_domain
-     result: domain=recipient.domain/sender_domain=sender.domain
-considering: domain=$domain/sender_domain=$sender_address_domain
-  expanding: domain=$domain/sender_domain=$sender_address_domain
-     result: domain=recipient.domain/sender_domain=sender.domain
+try option message_size_limit
+try option acl_smtp_connect
+try option smtp_banner
+ ╭considering: $smtp_active_hostname░ESMTP░Exim░$version_number░$tod_full
+ ├──────value: the.local.host.name
+ ├considering: ░ESMTP░Exim░$version_number░$tod_full
+ ├───────text: ░ESMTP░Exim░
+ ├considering: $version_number░$tod_full
+ ├──────value: x.yz
+ ├considering: ░$tod_full
+ ├───────text: ░
+ ├considering: $tod_full
+ ├──────value: Tue,░2░Mar░1999░09:44:33░+0000
+ ├───expanded: $smtp_active_hostname░ESMTP░Exim░$version_number░$tod_full
+ ╰─────result: the.local.host.name░ESMTP░Exim░x.yz░Tue,░2░Mar░1999░09:44:33░+0000
+try option acl_smtp_helo
+ ╭considering: ${if░match_domain░{$sender_helo_name}{+dlist}}
+  ╭considering: $sender_helo_name}{+dlist}}
+  ├──────value: ehlo.domain
+             ╰──(tainted)
+  ├considering: }{+dlist}}
+  ├───expanded: $sender_helo_name
+  ╰─────result: ehlo.domain
+             ╰──(tainted)
+  ╭considering: +dlist}}
+  ├───────text: +dlist
+  ├considering: }}
+  ├───expanded: +dlist
+  ╰─────result: +dlist
+  ╭considering: $domain
+  ├──────value: ehlo.domain
+             ╰──(tainted)
+  ├───expanded: $domain
+  ╰─────result: ehlo.domain
+             ╰──(tainted)
+ ├──condition: match_domain░{$sender_helo_name}{+dlist}
+ ├─────result: true
+ ├───expanded: ${if░match_domain░{$sender_helo_name}{+dlist}}
+ ╰─────result: true
+try option acl_smtp_etrn
+try option acl_smtp_vrfy
+try option acl_smtp_expn
+try option acl_smtp_mail
+ ╭considering: domain=$domain/sender_domain=$sender_address_domain
+ ├───────text: domain=
+ ├considering: $domain/sender_domain=$sender_address_domain
+ ├──────value: 
+ ├considering: /sender_domain=$sender_address_domain
+ ├───────text: /sender_domain=
+ ├considering: $sender_address_domain
+ ├──────value: sender.domain
+            ╰──(tainted)
+ ├───expanded: domain=$domain/sender_domain=$sender_address_domain
+ ╰─────result: domain=/sender_domain=sender.domain
+            ╰──(tainted)
+try option acl_smtp_rcpt
+ ╭considering: domain=$domain/sender_domain=$sender_address_domain
+ ├───────text: domain=
+ ├considering: $domain/sender_domain=$sender_address_domain
+ ├──────value: recipient.domain
+            ╰──(tainted)
+ ├considering: /sender_domain=$sender_address_domain
+ ├───────text: /sender_domain=
+ ├considering: $sender_address_domain
+ ├──────value: sender.domain
+            ╰──(tainted)
+ ├───expanded: domain=$domain/sender_domain=$sender_address_domain
+ ╰─────result: domain=recipient.domain/sender_domain=sender.domain
+            ╰──(tainted)
+ ╭considering: domain=$domain/sender_domain=$sender_address_domain
+ ├───────text: domain=
+ ├considering: $domain/sender_domain=$sender_address_domain
+ ├──────value: recipient.domain
+            ╰──(tainted)
+ ├considering: /sender_domain=$sender_address_domain
+ ├───────text: /sender_domain=
+ ├considering: $sender_address_domain
+ ├──────value: sender.domain
+            ╰──(tainted)
+ ├───expanded: domain=$domain/sender_domain=$sender_address_domain
+ ╰─────result: domain=recipient.domain/sender_domain=sender.domain
+            ╰──(tainted)
+try option acl_smtp_quit
 LOG: smtp_connection MAIN
-  SMTP connection from CALLER closed by QUIT
->>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>
+  SMTP connection from CALLER D=qqs closed by QUIT
+>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>