X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1058096b8c5317376c1df7473f6ca7c543d20715..44e35f5f592b4fb993a6a23ad9e0446af8a6d527:/test/stderr/0544 diff --git a/test/stderr/0544 b/test/stderr/0544 index 40751acc5..17ec179ea 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -1,4 +1,6 @@ Exim version x.yz .... +environment after trimming: + PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user @@ -37,6 +39,7 @@ admin user ${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 @@ -84,6 +87,7 @@ admin user ╎ ${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) @@ -108,6 +112,7 @@ admin user 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) @@ -129,6 +134,7 @@ admin user ${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) @@ -147,6 +153,7 @@ admin user ├─────result: (helo=) ╰───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>) @@ -155,6 +162,7 @@ admin user ├──expanding: ${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>) @@ -166,6 +174,7 @@ admin user ${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>) @@ -190,6 +199,7 @@ admin user ${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>) @@ -203,16 +213,19 @@ admin user for $received_for}} ├──expanding: 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}} ├──expanding: ($tls_in_ver) ├─────result: () ╰───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>) @@ -231,6 +244,7 @@ admin user ${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>) @@ -247,6 +261,7 @@ admin user ├─────result: tls ╰───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 { @@ -256,6 +271,7 @@ admin user ${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 { @@ -274,6 +290,7 @@ admin user ├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}} @@ -285,11 +302,14 @@ admin user ╰─────result: (envelope-from ) + ├───item-res: (envelope-from ) + ├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 @@ -299,12 +319,14 @@ admin user ├───────text: for ├───scanning: $received_for}} + ├──────value: ├───scanning: }} ├──expanding: for $received_for ├─────result: for ╰───skipping: result is not used + ├───item-res: ├──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 @@ -314,7 +336,7 @@ admin user for $received_for}} ╰─────result: Received: from CALLER by the.local.host.name with local (Exim x.yz) (envelope-from ) - id 10HmaX-0005vi-00 + id 10HmaX-000000005vi-0000 ╭considering: ${tod_full} ├──expanding: ${tod_full} ╰─────result: Tue, 2 Mar 1999 09:44:33 +0000 @@ -322,12 +344,16 @@ 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= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config trusted user admin user dropping to exim gid; retaining priv uid ╭considering: $domain + ├──────value: domain1.ex + ╰──(tainted) ├──expanding: $domain ╰─────result: domain1.ex ╰──(tainted) @@ -354,6 +380,9 @@ LOG: MAIN ├considering: } }{ match{$h_auto-submitted:}{(?i)auto-generated|auto-replied} }} {no}{yes}} ├──expanding: (?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}} ├──expanding: $h_auto-submitted: @@ -363,6 +392,9 @@ LOG: MAIN ├considering: } }} {no}{yes}} ├──expanding: (?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}} @@ -378,25 +410,32 @@ 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 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> 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= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN SMTP connection from CALLER ╭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 ├──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}} + ├──────value: ehlo.domain + ╰──(tainted) ├considering: }{+dlist}} ├──expanding: $sender_helo_name ╰─────result: ehlo.domain @@ -407,6 +446,8 @@ LOG: smtp_connection MAIN ├──expanding: +dlist ╰─────result: +dlist ╭considering: $domain + ├──────value: ehlo.domain + ╰──(tainted) ├──expanding: $domain ╰─────result: ehlo.domain ╰──(tainted) @@ -417,30 +458,41 @@ LOG: smtp_connection MAIN ╭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) ├──expanding: domain=$domain/sender_domain=$sender_address_domain ╰─────result: 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) ├──expanding: 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) ├──expanding: domain=$domain/sender_domain=$sender_address_domain ╰─────result: domain=recipient.domain/sender_domain=sender.domain ╰──(tainted) LOG: smtp_connection MAIN - SMTP connection from CALLER closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> + SMTP connection from CALLER D=qqs closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>