X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ae8f9024d8d4fad31457d758022e3186d782929c..e5903596a0:/test/stderr/0402?ds=sidebyside diff --git a/test/stderr/0402 b/test/stderr/0402 index 13ae71822..9f6f6264e 100644 --- a/test/stderr/0402 +++ b/test/stderr/0402 @@ -41,7 +41,8 @@ Data file written for message 10HmaX-0005vi-00 └─────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) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${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}} @@ -49,7 +50,8 @@ Data file written for message 10HmaX-0005vi-00 ├─────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) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${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}} @@ -59,19 +61,22 @@ Data file written for message 10HmaX-0005vi-00 └───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) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${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}} (Exim $version_number) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${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}} (Exim $version_number) + ╎ }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${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}} @@ -82,7 +87,8 @@ Data file written for message 10HmaX-0005vi-00 ├──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) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${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}} @@ -96,12 +102,25 @@ Data file written for message 10HmaX-0005vi-00 └─────result: from CALLER ├──condition: def:received_protocol ├─────result: true - ┌considering: with $received_protocol}} (Exim $version_number) + ┌considering: with $received_protocol }}${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}} - ├──expanding: with $received_protocol - └─────result: with local + ├──expanding: with $received_protocol + └─────result: with local + ├──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}} + ├──expanding: tls $tls_in_cipher_std + + ├─────result: tls + + └───skipping: result is not used ├──condition: def:sender_address ├─────result: true ┌considering: (envelope-from <$sender_address>) @@ -122,7 +141,8 @@ Data file written for message 10HmaX-0005vi-00 └───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) + }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol }}${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}} @@ -136,7 +156,7 @@ P Received: from CALLER by mail.test.ex with local (Exim x.yz) ┌considering: ${tod_full} ├──expanding: ${tod_full} └─────result: Tue, 2 Mar 1999 09:44:33 +0000 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 DSN: Write SPOOL :-dsn_envid NULL DSN: Write SPOOL :-dsn_ret 0 DSN: Flags :0 @@ -162,6 +182,7 @@ changed uid/gid: forcing real = effective configuration file is TESTSUITE/test-config trusted user admin user +dropping to exim gid; retaining priv uid seeking password data for user "CALLER": cache not available getpwnam() succeeded uid=CALLER_UID gid=CALLER_GID seeking password data for user "CALLER": using cached result @@ -205,32 +226,32 @@ no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: CALLER@test.ex unique = CALLER@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record CALLER@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: usery@test.ex unique = usery@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record usery@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: userz@test.ex unique = userz@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record userz@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: rd+CALLER@test.ex unique = rd+CALLER@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record rd+CALLER@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: rd+usery@test.ex unique = rd+usery@test.ex -no domain retry record -no address retry record +no domain retry record +no address retry record rd+usery@test.ex: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing rd+usery@test.ex