diff options
| author | Jeremy Harris <jgh146exb@wizmail.org> | 2017-10-28 21:33:24 +0100 |
|---|---|---|
| committer | Jeremy Harris <jgh146exb@wizmail.org> | 2017-10-28 21:33:24 +0100 |
| commit | c5db348c5e29e93e51389fa0079f829967c5da82 (patch) | |
| tree | 0b876cbf4e1ae8dac81c63256ee233376940e2c8 /test/stderr/0544 | |
| parent | 1e0f06b3cfeb3c2453323453555d827c81456e1e (diff) | |
| parent | cd328be98eb5bdda73316eaf95d9d6a617c7df7d (diff) | |
Merge branch 'master' into 4.next
Diffstat (limited to 'test/stderr/0544')
| -rw-r--r-- | test/stderr/0544 | 20 |
1 files changed, 4 insertions, 16 deletions
diff --git a/test/stderr/0544 b/test/stderr/0544 index f32cd8886..e45faa1e9 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -36,7 +36,7 @@ admin user }}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}} (Exim $version_number) ╎ ${if def:sender_address {(envelope-from <$sender_address>) ╎ }}id $message_exim_id${if def:received_for { ╎ for $received_for}} @@ -67,18 +67,6 @@ admin user 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: () - - └───skipping: result is not used ├──condition: def:sender_address ├─────result: true ┌considering: (envelope-from <$sender_address>) @@ -153,8 +141,8 @@ LOG: MAIN └─────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 pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... configuration file is TESTSUITE/test-config admin user @@ -188,4 +176,4 @@ LOG: smtp_connection MAIN └─────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 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (msg setup toplevel) terminating with rc=0 >>>>>>>>>>>>>>>> |