X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/e47376befc6e4a415319e3c29fad9b0ba2bbd8ee..d093f8e514d0e914bae3dc34b4e4f0a51720c690:/test/stderr/5410?ds=sidebyside diff --git a/test/stderr/5410 b/test/stderr/5410 index 8762f82a1..cb1b31b72 100644 --- a/test/stderr/5410 +++ b/test/stderr/5410 @@ -9,6 +9,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} @@ -17,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 @@ -55,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 @@ -68,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: * @@ -87,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: * @@ -100,12 +102,14 @@ 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 hosts_require_ocsp? no (option unset) 127.0.0.1 in hosts_request_ocsp? yes (matched "*") 127.0.0.1 in tls_verify_hosts? no (option unset) 127.0.0.1 in tls_try_verify_hosts? no (end of list) 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,9 +117,12 @@ 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 ------------ processing "accept" accept: condition test succeeded in inline ACL @@ -127,17 +134,15 @@ considering: ${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}} ${if def:tls_cipher {($tls_cipher) - }}(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}} -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) - }}(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}} @@ -147,22 +152,19 @@ condition: def:sender_rcvhost 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_cipher {($tls_cipher) - }}(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}} -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) + }}}}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}} ${if def:tls_cipher {($tls_cipher) - }}(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}} @@ -170,11 +172,10 @@ 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) + }}}}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}} @@ -186,17 +187,16 @@ considering: (helo=$sender_helo_name) }} result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + 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-esmtp -condition: def:sender_address - result: true + condition: def:sender_address + result: true considering: (envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -204,8 +204,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: @@ -214,15 +214,14 @@ considering: for userx@domain.com 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_cipher {($tls_cipher) - }}(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}} result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmaY-0005vi-00 + id 10HmaX-0005vi-00 for userx@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ @@ -230,10 +229,12 @@ considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaX-0005vi-00 + SMTP<< 250 OK id=10HmaY-0005vi-00 LOG: MAIN - >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaX-0005vi-00" + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] X=TLSv1:AES256-SHA:256 CV=no C="250 OK id=10HmaY-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss @@ -253,6 +254,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} @@ -261,8 +263,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 @@ -299,6 +301,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 @@ -312,8 +315,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: * @@ -326,9 +329,12 @@ 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 ------------ processing "accept" accept: condition test succeeded in inline ACL @@ -340,17 +346,15 @@ considering: ${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}} ${if def:tls_cipher {($tls_cipher) - }}(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}} -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) - }}(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}} @@ -360,22 +364,19 @@ condition: def:sender_rcvhost 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_cipher {($tls_cipher) - }}(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}} -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) + }}}}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}} ${if def:tls_cipher {($tls_cipher) - }}(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}} @@ -383,11 +384,10 @@ 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) + }}}}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}} @@ -399,17 +399,16 @@ considering: (helo=$sender_helo_name) }} result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + 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-esmtp -condition: def:sender_address - result: true + condition: def:sender_address + result: true considering: (envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -417,8 +416,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: @@ -427,15 +426,14 @@ considering: for usery@domain.com 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_cipher {($tls_cipher) - }}(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}} result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbA-0005vi-00 + id 10HmaZ-0005vi-00 for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ @@ -443,10 +441,12 @@ considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmaZ-0005vi-00 + SMTP<< 250 OK id=10HmbA-0005vi-00 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmaZ-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbA-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss @@ -466,6 +466,7 @@ considering: $smtp_active_hostname ESMTP Exim $version_number $tod_full result: myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000 in dsn_advertise_hosts? no (option unset) in pipelining_advertise_hosts? yes (matched "*") + in chunking_advertise_hosts? no (end of list) in tls_advertise_hosts? yes (matched "*") considering: ${if eq {SERVER}{server}{queue}{cutthrough}} considering: SERVER}{server}{queue}{cutthrough}} @@ -474,8 +475,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 @@ -512,6 +513,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 @@ -525,8 +527,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: * @@ -539,9 +541,12 @@ 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 ------------ processing "accept" accept: condition test succeeded in inline ACL @@ -553,17 +558,15 @@ considering: ${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}} ${if def:tls_cipher {($tls_cipher) - }}(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}} -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) - }}(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}} @@ -573,22 +576,19 @@ condition: def:sender_rcvhost 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_cipher {($tls_cipher) - }}(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}} -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) + }}}}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}} ${if def:tls_cipher {($tls_cipher) - }}(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}} @@ -596,11 +596,10 @@ 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) + }}}}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}} @@ -612,17 +611,16 @@ considering: (helo=$sender_helo_name) }} result: from CALLER (helo=myhost.test.ex) -condition: def:received_protocol - result: true -considering: with $received_protocol}} ${if def:tls_cipher {($tls_cipher) - }}(Exim $version_number) + 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-esmtp -condition: def:sender_address - result: true + condition: def:sender_address + result: true considering: (envelope-from <$sender_address>) }}id $message_exim_id${if def:received_for { for $received_for}} @@ -630,8 +628,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: @@ -640,15 +638,14 @@ considering: for usery@domain.com 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_cipher {($tls_cipher) - }}(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}} result: Received: from CALLER (helo=myhost.test.ex) by myhost.test.ex with local-esmtp (Exim x.yz) (envelope-from ) - id 10HmbC-0005vi-00 + id 10HmbB-0005vi-00 for usery@domain.com ----------- start cutthrough headers send ----------- ----------- done cutthrough headers send ------------ @@ -656,10 +653,12 @@ considering: ${tod_full} expanding: ${tod_full} result: Tue, 2 Mar 1999 09:44:33 +0000 SMTP>> . - SMTP<< 250 OK id=10HmbB-0005vi-00 + SMTP<< 250 OK id=10HmbC-0005vi-00 LOG: MAIN - >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbB-0005vi-00" + >> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK id=10HmbC-0005vi-00" SMTP>> QUIT + SMTP<< 221 myhost.test.ex closing connection + SMTP(close)>> ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss