X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/e8a0da772adc2892e661dec2bad4f36196c9128f..aa091f5c136d0f5b13ca6d6eb3e2dd0bcadcf8eb:/test/stderr/0544 diff --git a/test/stderr/0544 b/test/stderr/0544 index a9879b1c7..de449b123 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -1,4 +1,5 @@ Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -31,6 +32,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_rcvhost ├─────result: false ╭───scanning: from░$sender_rcvhost↩ @@ -74,6 +76,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_ident ├─────result: true ╭considering: from░${quote_local_part:$sender_ident}░}}${if░def:sender_helo_name░{(helo=$sender_helo_name)↩ @@ -127,6 +130,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_helo_name ├─────result: false ╭───scanning: (helo=$sender_helo_name)↩ @@ -193,6 +197,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──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↩ @@ -226,6 +231,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} @@ -238,6 +244,7 @@ try option received_header_text ␉${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:tls_in_cipher_std ├─────result: false ╭───scanning: ░tls░$tls_in_cipher_std↩ @@ -287,6 +294,7 @@ try option received_header_text ├considering: ${if░def:sender_address░{(envelope-from░<$sender_address>)↩ ␉}}id░$message_exim_id${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:sender_address ├─────result: true ╭considering: (envelope-from░<$sender_address>)↩ @@ -318,6 +326,7 @@ try option received_header_text ├──────value: 10HmaX-000000005vi-0000 ├considering: ${if░def:received_for░{↩ ␉for░$received_for}} + cond: def ├──condition: def:received_for ├─────result: false ╭───scanning: ↩ @@ -350,6 +359,7 @@ LOG: MAIN <= CALLER@test.ex U=CALLER P=local S=sss created log directory TESTSUITE/spool/log Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -361,13 +371,12 @@ 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 max_rcpt try option multi_domain try option max_parallel try option return_path @@ -377,45 +386,50 @@ try option return_path ├───expanded: $domain ╰─────result: domain1.ex ╰──(tainted) +>>>>>>>>>>>>>>>> Exim pid=p1236 (transport) terminating with rc=0 >>>>>>>>>>>>>>>> LOG: MAIN == 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): 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 + cond: or + cond: eq + ╎╭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: + cond: match + ╎╭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 + cond: match + ╎╭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}} @@ -434,6 +448,7 @@ try option delay_warning_condition >>>>>>>>>>>>>>>> Exim pid=p1235 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> >>>>>>>>>>>>>>>> Exim pid=p1234 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> Exim version x.yz .... +Hints DB: environment after trimming: PATH= adding SSLKEYLOGFILE=TESTSUITE/spool/sslkeys @@ -462,24 +477,25 @@ try option smtp_banner ╰─────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) + cond: match_domain + ╭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}} @@ -487,6 +503,7 @@ try option acl_smtp_helo try option acl_smtp_etrn try option acl_smtp_vrfy try option acl_smtp_expn + in chunking_advertise_hosts? no (end of list) try option acl_smtp_mail ╭considering: domain=$domain/sender_domain=$sender_address_domain ├───────text: domain= @@ -500,6 +517,7 @@ try option acl_smtp_mail ├───expanded: domain=$domain/sender_domain=$sender_address_domain ╰─────result: domain=/sender_domain=sender.domain ╰──(tainted) + in "domain=/sender_domain=sender.domain"? no (end of list) try option acl_smtp_rcpt ╭considering: domain=$domain/sender_domain=$sender_address_domain ├───────text: domain= @@ -514,6 +532,7 @@ try option acl_smtp_rcpt ├───expanded: domain=$domain/sender_domain=$sender_address_domain ╰─────result: domain=recipient.domain/sender_domain=sender.domain ╰──(tainted) +recipient.domain in "domain=recipient.domain/sender_domain=sender.domain"? no (end of list) ╭considering: domain=$domain/sender_domain=$sender_address_domain ├───────text: domain= ├considering: $domain/sender_domain=$sender_address_domain @@ -527,7 +546,8 @@ try option acl_smtp_rcpt ├───expanded: domain=$domain/sender_domain=$sender_address_domain ╰─────result: domain=recipient.domain/sender_domain=sender.domain ╰──(tainted) +sender.domain in "domain=recipient.domain/sender_domain=sender.domain"? no (end of list) try option acl_smtp_quit LOG: smtp_connection MAIN SMTP connection from CALLER D=qqs closed by QUIT ->>>>>>>>>>>>>>>> Exim pid=p1236 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=p1237 (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>