X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/528fde2aff25fbe284332ad2ec4b8cb5fc8c7859..2381c830c6f89e3abc2dc153d483251a4403e71f:/test/stderr/5400?ds=sidebyside diff --git a/test/stderr/5400 b/test/stderr/5400 index c8331e5da..1c9b0d83a 100644 --- a/test/stderr/5400 +++ b/test/stderr/5400 @@ -3,13 +3,19 @@ configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN SMTP connection from CALLER +using ACL "ar" processing "accept" check control = cutthrough_delivery -accept: condition test succeeded in inline ACL +check logwrite = rcpt for $local_part@$domain + = rcpt for userx@domain.com +LOG: MAIN + rcpt for userx@domain.com +created log directory TESTSUITE/spool/log +accept: condition test succeeded in ACL "ar" ----------- start cutthrough setup ------------ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM: SMTP<< 250 Sender OK @@ -20,12 +26,17 @@ processing "accept" accept: condition test succeeded in inline ACL SMTP>> DATA SMTP<< 354 Send data +----------- start cutthrough headers send ----------- +added header line(s): +X-hdr-rtr-new: +++ +--- +----------- done cutthrough headers send ------------ SMTP>> . SMTP<< 250 OK ------------ cutthrough close ------------ LOG: MAIN - >> userx@domain.com R=all T=smtp -created log directory TESTSUITE/spool/log + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" + SMTP>> QUIT +----------- cutthrough shutdown (delivered) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss LOG: MAIN @@ -38,24 +49,81 @@ configuration file is TESTSUITE/test-config admin user LOG: smtp_connection MAIN SMTP connection from CALLER +using ACL "ar" processing "accept" check control = cutthrough_delivery +check logwrite = rcpt for $local_part@$domain + = rcpt for userz@domain.com +LOG: MAIN + rcpt for userz@domain.com +accept: condition test succeeded in ACL "ar" +----------- start cutthrough setup ------------ +Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected + SMTP<< 220 SMTP only spoken here + SMTP>> EHLO myhost.test.ex + SMTP<< 550 Not here, mate + SMTP>> HELO myhost.test.ex + SMTP<< 250 OK + SMTP>> MAIL FROM: + SMTP<< 250 Sender OK + SMTP>> RCPT TO: + SMTP<< 250 Recipient OK +----------- end cutthrough setup ------------ +processing "accept" accept: condition test succeeded in inline ACL + SMTP>> DATA + SMTP<< 354 Send data +----------- start cutthrough headers send ----------- +added header line(s): +X-hdr-rtr-new: +++ +--- +----------- done cutthrough headers send ------------ + SMTP>> . + SMTP<< 250 OK +LOG: MAIN + >> userz@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" + SMTP>> QUIT +----------- cutthrough shutdown (delivered) ------------ +LOG: MAIN + <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss +LOG: MAIN + Completed +LOG: smtp_connection MAIN + SMTP connection from CALLER closed by QUIT +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +LOG: smtp_connection MAIN + SMTP connection from CALLER +using ACL "ar" +processing "accept" +check control = cutthrough_delivery +check logwrite = rcpt for $local_part@$domain + = rcpt for usery@domain.com +LOG: MAIN + rcpt for usery@domain.com +accept: condition test succeeded in ACL "ar" ----------- start cutthrough setup ------------ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP - SMTP>> HELO myhost.test.ex + SMTP>> EHLO myhost.test.ex SMTP<< 250 OK SMTP>> MAIL FROM: SMTP<< 250 Sender OK - SMTP>> RCPT TO: + SMTP>> RCPT TO: SMTP<< 250 Recipient OK ----------- end cutthrough setup ------------ +using ACL "ar" processing "accept" check control = cutthrough_delivery -accept: condition test succeeded in inline ACL +check logwrite = rcpt for $local_part@$domain + = rcpt for userx@domain.com +LOG: MAIN + rcpt for userx@domain.com +accept: condition test succeeded in ACL "ar" SMTP>> QUIT ------------ cutthrough shutdown ------------ +----------- cutthrough shutdown (more than one recipient) ------------ LOG: MAIN <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss LOG: smtp_connection MAIN @@ -66,13 +134,13 @@ configuration file is TESTSUITE/test-config trusted user admin user >>>>>>>>>>>>>>>> Remote deliveries >>>>>>>>>>>>>>>> ---------> userx@domain.com <-------- +--------> usery@domain.com <-------- smtp transport entered - userx@domain.com usery@domain.com + userx@domain.com checking status of 127.0.0.1 127.0.0.1 [127.0.0.1]:1111 status = usable -delivering 10HmaY-0005vi-00 to 127.0.0.1 [127.0.0.1] (userx@domain.com, ...) +delivering 10HmaZ-0005vi-00 to 127.0.0.1 [127.0.0.1] (usery@domain.com, ...) Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected SMTP<< 220 ESMTP SMTP>> EHLO myhost.test.ex @@ -80,13 +148,16 @@ Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected not using PIPELINING SMTP>> MAIL FROM: SMTP<< 250 Sender OK - SMTP>> RCPT TO: - SMTP<< 250 Recipient OK SMTP>> RCPT TO: SMTP<< 250 Recipient OK + SMTP>> RCPT TO: + SMTP<< 250 Recipient OK SMTP>> DATA SMTP<< 354 Send data SMTP>> writing message and terminating "." +added header line(s): +X-hdr-rtr-new: +++ +--- writing data block fd=dddd size=sss timeout=300 SMTP<< 250 OK ok=1 send_quit=1 send_rset=0 continue_more=0 yield=0 first_address is NULL @@ -96,9 +167,60 @@ no messages waiting for 127.0.0.1 SMTP>> QUIT Leaving smtp transport LOG: MAIN - => userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] + => usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" +LOG: MAIN + -> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" +LOG: MAIN + Completed +>>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>> +Exim version x.yz .... +configuration file is TESTSUITE/test-config +admin user +LOG: smtp_connection MAIN + SMTP connection from CALLER +using ACL "ar" +processing "accept" +check control = cutthrough_delivery +check logwrite = rcpt for $local_part@$domain + = rcpt for userx@domain.com +LOG: MAIN + rcpt for userx@domain.com +accept: condition test succeeded in ACL "ar" +----------- start cutthrough setup ------------ +Connecting to 127.0.0.1 [127.0.0.1]:1224 from ip4.ip4.ip4.ip4 ... connected + SMTP<< 220 ESMTP + SMTP>> EHLO myhost.test.ex + SMTP<< 250 OK + SMTP>> MAIL FROM: + SMTP<< 250 Sender OK + SMTP>> RCPT TO: + SMTP<< 250 Recipient OK +----------- end cutthrough setup ------------ +processing "accept" +accept: condition test succeeded in inline ACL + SMTP>> DATA + SMTP<< 354 Send data +----------- start cutthrough headers send ----------- +removed header line: +X-hdr-rtr: qqq +--- +added header line(s): +X-hdr-rtr-new: +++ +--- +added header line: +X-hdr-tpt-new: new +--- +----------- done cutthrough headers send ------------ + SMTP>> . + SMTP<< 250 OK LOG: MAIN - -> usery@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] + >> userx@domain.com R=all T=smtp H=127.0.0.1 [127.0.0.1] C="250 OK" + SMTP>> QUIT +----------- cutthrough shutdown (delivered) ------------ +LOG: MAIN + <= CALLER@myhost.test.ex U=CALLER P=local-esmtp S=sss LOG: MAIN Completed +LOG: smtp_connection MAIN + SMTP connection from CALLER closed by QUIT >>>>>>>>>>>>>>>> Exim pid=pppp terminating with rc=0 >>>>>>>>>>>>>>>>