X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/e47376befc6e4a415319e3c29fad9b0ba2bbd8ee..fb6833e0a5599216f7f0834eb608f0bdf771b2ee:/test/stderr/5420 diff --git a/test/stderr/5420 b/test/stderr/5420 index f289d1a4c..a1d4d3267 100644 --- a/test/stderr/5420 +++ b/test/stderr/5420 @@ -17,8 +17,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 @@ -68,8 +68,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 +87,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: * @@ -115,6 +115,7 @@ considering: :}} SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL @@ -131,8 +132,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) @@ -151,8 +152,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) @@ -169,8 +170,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) @@ -185,8 +186,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>) @@ -194,8 +195,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}} @@ -203,8 +216,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: @@ -221,7 +234,7 @@ considering: 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 ------------ @@ -229,9 +242,9 @@ 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=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn: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=TLS1.x:xxxxRSA_AES_256_CBC_SHAnnn:256 CV=no C="250 OK id=10HmaY-0005vi-00" SMTP>> QUIT ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN @@ -260,8 +273,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 @@ -311,8 +324,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,6 +341,7 @@ considering: *}{:}} SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL @@ -344,8 +358,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) @@ -364,8 +378,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) @@ -382,8 +396,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) @@ -398,8 +412,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>) @@ -407,8 +421,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}} @@ -416,8 +442,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: @@ -434,7 +460,7 @@ considering: 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 ------------ @@ -442,9 +468,9 @@ 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 ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN @@ -473,8 +499,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 @@ -524,8 +550,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: * @@ -541,6 +567,7 @@ considering: *}{:}} SMTP<< 250 OK SMTP>> RCPT TO: SMTP<< 250 Accepted +holding verify callout open for cutthrough delivery ----------- end cutthrough setup ------------ processing "accept" accept: condition test succeeded in inline ACL @@ -557,8 +584,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) @@ -577,8 +604,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) @@ -595,8 +622,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) @@ -611,8 +638,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>) @@ -620,8 +647,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}} @@ -629,8 +668,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: @@ -647,7 +686,7 @@ considering: 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 ------------ @@ -655,9 +694,9 @@ 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 ----------- cutthrough shutdown (delivered) ------------ LOG: MAIN