X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/3cf91d6de9952dd0c2a4327e2a0e61d06b53c417..e51462229029e40afa0932dd9c6337192a0dc70b:/test/stderr/0544

diff --git a/test/stderr/0544 b/test/stderr/0544
index e8b01dfe0..00ffeb85b 100644
--- a/test/stderr/0544
+++ b/test/stderr/0544
@@ -1,50 +1,114 @@
 Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 admin user
-expanding: ${tod_full}
-   result: Tue, 2 Mar 1999 09:44:33 +0000
-condition: def:sender_rcvhost
-   result: false
-expanding: from $sender_rcvhost
+ /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}} (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}} (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 
+  |_____result: from 
 	
-skipping: result is not used
-condition: def:sender_ident
-   result: true
-expanding: $sender_ident
-   result: CALLER
-expanding: from ${quote_local_part:$sender_ident} 
-   result: from CALLER 
-condition: def:sender_helo_name
-   result: false
-expanding: (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}}
+  |__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
+   |__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}}
+   |__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
-expanding: with $received_protocol
-   result: with local
-condition: def:sender_address
-   result: true
-expanding: (envelope-from <$sender_address>)
+  \_____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}}
+  |__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}}
+  |__expanding: ($tls_cipher)
 	
-   result: (envelope-from <CALLER@test.ex>)
+  |_____result: ()
 	
-condition: def:received_for
-   result: false
-expanding: 
+  \___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}}
+  |__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: 
+  |_____result: 
 	for 
-skipping: result is not used
-expanding: ${tod_full}
-   result: Tue, 2 Mar 1999 09:44:33 +0000
+  \___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}}
+ \_____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
 LOG: MAIN
   <= CALLER@test.ex U=CALLER P=local S=sss
 created log directory TESTSUITE/spool/log
@@ -52,33 +116,43 @@ Exim version x.yz ....
 configuration file is TESTSUITE/test-config
 trusted user
 admin user
-expanding: $domain
-   result: domain1.ex
+ /considering: $domain
+ |__expanding: $domain
+ \_____result: domain1.ex
 LOG: MAIN
   == userx@domain1.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
 LOG: MAIN
   == userx@domain2.ex R=smarthost T=smtp defer (-1): domain matches queue_smtp_domains, or -odqs set
-expanding: $h_list-id:$h_list-post:$h_list-subscribe:
-   result: 
-expanding: 
-   result: 
-expanding: $h_precedence:
-   result: 
-expanding: (?i)bulk|list|junk
-   result: (?i)bulk|list|junk
-expanding: $h_auto-submitted:
-   result: 
-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
-expanding: no
-   result: no
-skipping: result is not used
-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
+ /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 >>>>>>>>>>>>>>>>
 Exim version x.yz ....
@@ -86,24 +160,32 @@ configuration file is TESTSUITE/test-config
 admin user
 LOG: smtp_connection MAIN
   SMTP connection from CALLER
-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
-expanding: $sender_helo_name
-   result: ehlo.domain
-expanding: +dlist
-   result: +dlist
-expanding: $domain
-   result: ehlo.domain
-condition: match_domain {$sender_helo_name}{+dlist}
-   result: true
-expanding: ${if match_domain {$sender_helo_name}{+dlist}}
-   result: true
-expanding: domain=$domain/sender_domain=$sender_address_domain
-   result: domain=/sender_domain=sender.domain
-expanding: domain=$domain/sender_domain=$sender_address_domain
-   result: domain=recipient.domain/sender_domain=sender.domain
-expanding: domain=$domain/sender_domain=$sender_address_domain
-   result: domain=recipient.domain/sender_domain=sender.domain
+ /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
 LOG: smtp_connection MAIN
   SMTP connection from CALLER closed by QUIT
 >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>