X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/1b37ac39f7980e3dfe59521c23e8893a64064632..0cd6ae500bb94033ce32550e1ae17e8300f86920:/test/stderr/0544?ds=inline diff --git a/test/stderr/0544 b/test/stderr/0544 index 44582a1cc..cce031101 100644 --- a/test/stderr/0544 +++ b/test/stderr/0544 @@ -1,114 +1,122 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config admin user - ┌considering: ${tod_full} + ╭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}} + ╰─────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 }}${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_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}} + ╭───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 }}${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: from $sender_rcvhost - + ├─────result: from - - └───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}} + + ╰───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 }}${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) - ${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 + ╭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 }}${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 }}${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: $sender_ident + ╎╰─────result: CALLER ├──expanding: from ${quote_local_part:$sender_ident} - └─────result: from CALLER + ╰─────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}} + ╭───scanning: (helo=$sender_helo_name) + }}}}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}} ├──expanding: (helo=$sender_helo_name) - + ├─────result: (helo=) - - └───skipping: result is not used + + ╰───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 + }} + ╰─────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 + ╭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 + ├──condition: def:tls_in_cipher_std ├─────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 + ╭───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>) - }}id $message_exim_id${if def:received_for { - for $received_for}} + ╭considering: (envelope-from <$sender_address>) + }}id $message_exim_id${if def:received_for { + for $received_for}} ├──expanding: (envelope-from <$sender_address>) - - └─────result: (envelope-from ) - + + ╰─────result: (envelope-from ) + ├──condition: def:received_for ├─────result: false - ┌───scanning: - for $received_for}} + ╭───scanning: + for $received_for}} ├──expanding: - for $received_for + for $received_for ├─────result: - for - └───skipping: result is not used + for + ╰───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 ) - id 10HmaX-0005vi-00 - ┌considering: ${tod_full} + }{${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_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}} + ╰─────result: Received: from CALLER by the.local.host.name with local (Exim x.yz) + (envelope-from ) + id 10HmaX-0005vi-00 + ╭considering: ${tod_full} ├──expanding: ${tod_full} - └─────result: Tue, 2 Mar 1999 09:44:33 +0000 + ╰─────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 @@ -116,76 +124,83 @@ Exim version x.yz .... configuration file is TESTSUITE/test-config trusted user admin user - ┌considering: $domain +dropping to exim gid; retaining priv uid + ╭considering: $domain ├──expanding: $domain - └─────result: domain1.ex + ╰─────result: domain1.ex + ╰──(tainted) 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 - ┌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: ${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}} + ╰─────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}} + ╰─────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}} + ╰─────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}} + ╰─────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}} + ╰─────result: + ╭considering: (?i)auto-generated|auto-replied} }} {no}{yes}} ├──expanding: (?i)auto-generated|auto-replied - └─────result: (?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}} + ╭───scanning: no}{yes}} ├──expanding: no ├─────result: no - └───skipping: result is not used - ┌considering: yes}} + ╰───skipping: result is not used + ╭considering: yes}} ├──expanding: yes - └─────result: 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 >>>>>>>>>>>>>>>> + ╰─────result: yes +>>>>>>>>>>>>>>>> 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 LOG: smtp_connection MAIN SMTP connection from CALLER - ┌considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full + ╭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}} + ╰─────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}} + ╰─────result: ehlo.domain + ╰──(tainted) + ╭considering: +dlist}} ├──expanding: +dlist - └─────result: +dlist - ┌considering: $domain + ╰─────result: +dlist + ╭considering: $domain ├──expanding: $domain - └─────result: ehlo.domain + ╰─────result: ehlo.domain + ╰──(tainted) ├──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 + ╰─────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 + ╰─────result: domain=/sender_domain=sender.domain + ╰──(tainted) + ╭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 + ╰─────result: domain=recipient.domain/sender_domain=sender.domain + ╰──(tainted) + ╭considering: domain=$domain/sender_domain=$sender_address_domain ├──expanding: domain=$domain/sender_domain=$sender_address_domain - └─────result: domain=recipient.domain/sender_domain=sender.domain + ╰─────result: domain=recipient.domain/sender_domain=sender.domain + ╰──(tainted) 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 >>>>>>>>>>>>>>>>