X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/568092148bf6ade68174fa1ccf34b8c37d9064e9..4468bfff7dc28b9c54a5225d3f10a6aa6a67a1d9:/test/stderr/0388 diff --git a/test/stderr/0388 b/test/stderr/0388 index c77110e67..1c2a5a388 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -10,8 +10,7 @@ set_process_info: pppp delivering 10HmaX-0005vi-00 locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY returned from EXIM_DBOPEN: (nil) - ensuring TESTSUITE/spool/db/retry.lockfile is owned by exim - failed to open DB file TESTSUITE/spool/db/retry.lockfile: No such file or directory + failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: x@y @@ -55,7 +54,7 @@ get[host|ipnode]byname[2] looked up these IP addresses: queued for smtp transport: local_part = x domain = y errors_to=NULL - domain_data=NULL localpart_data=NULL + domain_data=NULL local_part_data=NULL routed by r1 router envelope to: x@y transport: smtp @@ -70,8 +69,6 @@ After routing: Deferred addresses: search_tidyup called search_tidyup called -fresh-exec forking for transport -postfork: transport changed uid/gid: remote delivery to x@y with transport=smtp uid=EXIM_UID gid=EXIM_GID pid=pppp set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp @@ -100,15 +97,16 @@ cmd buf flush ddd bytes LOG: MAIN H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0 - SMTP>> QUIT -cmd buf flush ddd bytes + SMTP+> QUIT +cmd buf flush ddd bytes (more expected) + SMTP(shutdown)>> + SMTP<< 250 OK SMTP(close)>> -fresh-exec forked for transport: npppp +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT:250' set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK address match test: subject=*@127.0.0.1 pattern=* 127.0.0.1 in "*"? yes (matched "*") *@127.0.0.1 in "*"? yes (matched "*") -set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish checking status of V4NET.0.0.0 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile @@ -123,6 +121,7 @@ LOG: MAIN H=V4NET.0.0.0 [V4NET.0.0.0] Network Error set_process_info: pppp delivering 10HmaX-0005vi-00: just tried V4NET.0.0.0 [V4NET.0.0.0]:PORT_S for x@y: result DEFER added retry item for T:V4NET.0.0.0:V4NET.0.0.0:1224: errno=dd more_errno=dd,A flags=2 +set_process_info: pppp delivering 10HmaX-0005vi-00: waiting for a remote delivery subprocess to finish set_process_info: pppp delivering 10HmaX-0005vi-00 (just run smtp for x@y in subprocess) search_tidyup called reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:1224 from subprocess @@ -145,9 +144,9 @@ Deferred addresses: EXIM_DBOPEN: file dir flags=O_RDWR returned from EXIM_DBOPEN: 0xAAAAAAAA opened hints database TESTSUITE/spool/db/retry: flags=O_RDWR -address match test: subject=x@y pattern=* -y in "*"? yes (matched "*") -x@y in "*"? yes (matched "*") + address match test: subject=x@y pattern=* + y in "*"? yes (matched "*") + x@y in "*"? yes (matched "*") retry for R:x@y = * 0 0 dbfn_read: key=R:x@y failing_interval=ttt message_age=ttt @@ -155,9 +154,9 @@ Writing retry data for R:x@y first failed=dddd last try=dddd next try=+1 expired=1 errno=-44 more_errno=dd,A H=127.0.0.1 [127.0.0.1]: SMTP error from remote mail server after RCPT TO:: 451 Temporary error dbfn_write: key=R:x@y -address match test: subject=*@V4NET.0.0.0 pattern=* -V4NET.0.0.0 in "*"? yes (matched "*") -*@V4NET.0.0.0 in "*"? yes (matched "*") + address match test: subject=*@V4NET.0.0.0 pattern=* + V4NET.0.0.0 in "*"? yes (matched "*") + *@V4NET.0.0.0 in "*"? yes (matched "*") retry for T:V4NET.0.0.0:V4NET.0.0.0:1224 (y) = * 0 0 dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:1224 failing_interval=ttt message_age=ttt @@ -172,10 +171,7 @@ LOG: MAIN EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile end of retry processing -fresh-exec forking for bounce message -postfork: bounce message -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 -fresh-exec forked for bounce message: npppp +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd bounce-message -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -201,10 +197,13 @@ Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender -rewrite_one_header: type=F: - From: Mail Delivery System -rewrite_one_header: type=T: - To: CALLER@myhost.test.ex +qualify & rewrite recipients list +global rewrite rules +rewrite headers + rewrite_one_header: type=F: + From: Mail Delivery System + rewrite_one_header: type=T: + To: CALLER@myhost.test.ex search_tidyup called >>Headers after rewriting and local additions: X-Failed-Recipients: x@y @@ -223,17 +222,15 @@ Data file written for message 10HmaY-0005vi-00 >>Generated Received: header line P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) id 10HmaY-0005vi-00 - for CALLER@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000 + for CALLER@myhost.test.ex; + Tue, 2 Mar 1999 09:44:33 +0000 Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaY-0005vi-00-H Size of headers = sss LOG: MAIN <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss search_tidyup called -fresh-exec forking for local-accept delivery -postfork: local-accept delivery -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -odi -Mc 10HmaY-0005vi-00 -fresh-exec forked for local-accept delivery: npppp +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp @@ -297,9 +294,9 @@ LOG: MAIN Completed search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (bounce-message) terminating with rc=0 >>>>>>>>>>>>>>>> Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-0005vi-00 Renaming spool header file: TESTSUITE/spool//input//10HmaX-0005vi-00-H Size of headers = sss @@ -307,4 +304,4 @@ LOG: MAIN Completed search_tidyup called search_tidyup called ->>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> +>>>>>>>>>>>>>>>> Exim pid=pppp (fresh-exec) terminating with rc=0 >>>>>>>>>>>>>>>>