X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/aa368db3cd1fe1040bfe90ec1673e9a7c798db9b..76003495bfb6712c30b07cbcaf088c80b69b720d:/test/stderr/5420 diff --git a/test/stderr/5420 b/test/stderr/5420 index 9117875ef..635f4246d 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -18,8 +18,8 @@ considering: SERVER}{server}{queue}{cutthrough}} considering: server}{queue}{cutthrough}} expanding: server result: server -condition: eq {SERVER}{server} - result: false + condition: eq {SERVER}{server} + result: false scanning: queue}{cutthrough}} expanding: queue result: queue @@ -56,6 +56,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -69,8 +70,8 @@ considering: $address_data}{usery}{*}{:}} considering: usery}{*}{:}} expanding: usery result: usery -condition: eq {$address_data}{usery} - result: false + condition: eq {$address_data}{usery} + result: false scanning: *}{:}} expanding: * result: * @@ -88,8 +89,8 @@ considering: $address_data}{userz}{*}{:}} considering: userz}{*}{:}} expanding: userz result: userz -condition: eq {$address_data}{userz} - result: false + condition: eq {$address_data}{userz} + result: false scanning: *}{:}} expanding: * result: * @@ -101,11 +102,13 @@ considering: :}} result: : 127.0.0.1 in hosts_verify_avoid_tls? no (end of list) SMTP>> STARTTLS +cmd buf flush ddd bytes SMTP<< 220 TLS go ahead 127.0.0.1 in tls_verify_hosts? no (option unset) 127.0.0.1 in tls_try_verify_hosts? yes (matched "*") 127.0.0.1 in tls_verify_cert_hostnames? yes (matched "*") SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -113,8 +116,10 @@ considering: :}} 250 HELP 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -133,8 +138,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost ${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 + 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}} ${if def:tls_cipher {($tls_cipher) @@ -153,8 +158,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i ${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 + 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}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) @@ -171,8 +176,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name result: CALLER expanding: from ${quote_local_part:$sender_ident} result: from CALLER -condition: def:sender_helo_name - result: true + condition: def:sender_helo_name + result: true considering: (helo=$sender_helo_name) }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) @@ -187,8 +192,8 @@ considering: (helo=$sender_helo_name) }} result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true + condition: def:received_protocol + result: true considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) @@ -196,8 +201,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) for $received_for}} expanding: with $received_protocol result: with local-esmtp -condition: def:sender_address - result: true + 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>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -205,8 +222,8 @@ considering: (envelope-from <$sender_address>) result: (envelope-from ) -condition: def:received_for - result: true + condition: def:received_for + result: true considering: for $received_for}} expanding: @@ -263,8 +280,8 @@ considering: SERVER}{server}{queue}{cutthrough}} considering: server}{queue}{cutthrough}} expanding: server result: server -condition: eq {SERVER}{server} - result: false + condition: eq {SERVER}{server} + result: false scanning: queue}{cutthrough}} expanding: queue result: queue @@ -301,6 +318,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -314,8 +332,8 @@ considering: $address_data}{usery}{*}{:}} considering: usery}{*}{:}} expanding: usery result: usery -condition: eq {$address_data}{usery} - result: true + condition: eq {$address_data}{usery} + result: true considering: *}{:}} expanding: * result: * @@ -328,8 +346,10 @@ considering: *}{:}} 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -348,8 +368,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost ${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 + 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}} ${if def:tls_cipher {($tls_cipher) @@ -368,8 +388,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i ${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 + 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}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) @@ -386,8 +406,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name result: CALLER expanding: from ${quote_local_part:$sender_ident} result: from CALLER -condition: def:sender_helo_name - result: true + condition: def:sender_helo_name + result: true considering: (helo=$sender_helo_name) }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) @@ -402,8 +422,8 @@ considering: (helo=$sender_helo_name) }} result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true + condition: def:received_protocol + result: true considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) @@ -411,8 +431,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) for $received_for}} expanding: with $received_protocol result: with local-esmtp -condition: def:sender_address - result: true + 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>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -420,8 +452,8 @@ considering: (envelope-from <$sender_address>) result: (envelope-from ) -condition: def:received_for - result: true + condition: def:received_for + result: true considering: for $received_for}} expanding: @@ -478,8 +510,8 @@ considering: SERVER}{server}{queue}{cutthrough}} considering: server}{queue}{cutthrough}} expanding: server result: server -condition: eq {SERVER}{server} - result: false + condition: eq {SERVER}{server} + result: false scanning: queue}{cutthrough}} expanding: queue result: queue @@ -516,6 +548,7 @@ considering: $primary_hostname SMTP<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex +cmd buf flush ddd bytes SMTP<< 250-myhost.test.ex Hello the.local.host.name [ip4.ip4.ip4.ip4] 250-SIZE 52428800 250-8BITMIME @@ -529,8 +562,8 @@ considering: $address_data}{usery}{*}{:}} considering: usery}{*}{:}} expanding: usery result: usery -condition: eq {$address_data}{usery} - result: true + condition: eq {$address_data}{usery} + result: true considering: *}{:}} expanding: * result: * @@ -543,8 +576,10 @@ considering: *}{:}} 127.0.0.1 in hosts_avoid_tls? yes (matched "*") 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: +cmd buf flush ddd bytes SMTP<< 250 OK SMTP>> RCPT TO: +cmd buf flush ddd bytes SMTP<< 250 Accepted holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ @@ -563,8 +598,8 @@ considering: Received: ${if def:sender_rcvhost {from $sender_rcvhost ${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 + 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}} ${if def:tls_cipher {($tls_cipher) @@ -583,8 +618,8 @@ considering: ${if def:sender_ident {from ${quote_local_part:$sender_ident} }}${i ${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 + 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}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) @@ -601,8 +636,8 @@ considering: $sender_ident} }}${if def:sender_helo_name {(helo=$sender_helo_name result: CALLER expanding: from ${quote_local_part:$sender_ident} result: from CALLER -condition: def:sender_helo_name - result: true + condition: def:sender_helo_name + result: true considering: (helo=$sender_helo_name) }}}}by $primary_hostname ${if def:received_protocol {with $received_protocol}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) @@ -617,8 +652,8 @@ considering: (helo=$sender_helo_name) }} result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true + condition: def:received_protocol + result: true considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) }}(Exim $version_number) ${if def:sender_address {(envelope-from <$sender_address>) @@ -626,8 +661,20 @@ considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) for $received_for}} expanding: with $received_protocol result: with local-esmtp -condition: def:sender_address - result: true + 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>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -635,8 +682,8 @@ considering: (envelope-from <$sender_address>) result: (envelope-from ) -condition: def:received_for - result: true + condition: def:received_for + result: true considering: for $received_for}} expanding: