X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e..799253d6a75db70c631716a190736c285a97155c:/test/stderr/0388?ds=sidebyside diff --git a/test/stderr/0388 b/test/stderr/0388 index f3a48e5fc..a84d5b163 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -1,11 +1,12 @@ Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=p1234 configuration file is TESTSUITE/test-config admin user dropping to exim gid; retaining priv uid set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaX-0005vi-00 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY @@ -23,9 +24,9 @@ routing x@y --------> r0 router <-------- local_part=x domain=y checking local_parts -x in "CALLER"? +x in local_parts? list element: CALLER -x in "CALLER"? no (end of list) +x in local_parts? no (end of list) r0 router skipped: local_parts mismatch --------> r1 router <-------- local_part=x domain=y @@ -75,7 +76,7 @@ search_tidyup called search_tidyup called changed uid/gid: remote delivery to x@y with transport=smtp uid=EXIM_UID gid=EXIM_GID pid=p1235 -set_process_info: pppp delivering 10HmaX-0005vi-00 using smtp +set_process_info: pppp delivering 10HmaX-000000005vi-0000 using smtp checking retry status of 127.0.0.1 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile @@ -84,18 +85,16 @@ checking retry status of 127.0.0.1 failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available 127.0.0.1 in serialize_hosts? no (option unset) -set_process_info: pppp delivering 10HmaX-0005vi-00 to 127.0.0.1 [127.0.0.1]:PORT_S (x@y) -Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen? - list element: - connected +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to 127.0.0.1 [127.0.0.1]:PORT_S (x@y) +Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... + 127.0.0.1 in hosts_try_fastopen? + list element: +connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex cmd buf flush ddd bytes SMTP<< 250 OK - compiled RE '.outlook.com$' not found in local cache - compiling RE '.outlook.com$' - compiled RE '.outlook.com$' saved in local cache 127.0.0.1 in hosts_require_auth? no (option unset) SMTP>> MAIL FROM: cmd buf flush ddd bytes @@ -111,8 +110,8 @@ cmd buf flush ddd bytes (more expected) SMTP(shutdown)>> SMTP<< 250 OK SMTP(close)>> -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 +cmdlog: '220:EHLO:250:MAIL:250:RCPT:451:QUIT+:250' +set_process_info: pppp delivering 10HmaX-000000005vi-0000: just tried 127.0.0.1 [127.0.0.1]:PORT_S for x@y: result OK *@127.0.0.1 in "*"? list element: * address match test: subject=*@127.0.0.1 pattern=* @@ -129,26 +128,27 @@ checking retry status of V4NET.0.0.0 failed to open DB file TESTSUITE/spool/db/retry: No such file or directory no retry data available V4NET.0.0.0 in serialize_hosts? no (option unset) -set_process_info: pppp delivering 10HmaX-0005vi-00 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y) -Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... V4NET.0.0.0 in hosts_try_fastopen? +set_process_info: pppp delivering 10HmaX-000000005vi-0000 to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S (x@y) +Connecting to V4NET.0.0.0 [V4NET.0.0.0]:PORT_S ... + V4NET.0.0.0 in hosts_try_fastopen? failed: Network Error 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:PORT_S: 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) +set_process_info: pppp delivering 10HmaX-000000005vi-0000: 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:PORT_S: errno=dd more_errno=dd,A flags=2 +set_process_info: pppp delivering 10HmaX-000000005vi-0000: waiting for a remote delivery subprocess to finish +set_process_info: pppp delivering 10HmaX-000000005vi-0000 (just run smtp for x@y in subprocess) search_tidyup called -reading retry information for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S from subprocess +reading retry information for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S from subprocess added retry item reading retry information for R:x@y from subprocess added retry item -set_process_info: pppp delivering 10HmaX-0005vi-00 +set_process_info: pppp delivering 10HmaX-000000005vi-0000 LOG: MAIN == x@y R=r1 T=smtp defer (dd): Network Error H=127.0.0.1 [127.0.0.1] changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1234 -set_process_info: pppp tidying up after delivering 10HmaX-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaX-000000005vi-0000 Processing retry items Succeeded addresses: Failed addresses: @@ -168,11 +168,12 @@ Deferred addresses: x@y in "*"? yes (matched "*") retry for R:x@y = * 0 0 dbfn_read: key=R:x@y + dbfn_read: null return failing_interval=ttt message_age=ttt 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 + dbfn_write: key=R:x@y datalen NNN *@V4NET.0.0.0 in "*"? list element: * address match test: subject=*@V4NET.0.0.0 pattern=* @@ -180,22 +181,24 @@ Writing retry data for R:x@y list element: * 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:PORT_S (y) = * 0 0 - dbfn_read: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S +retry for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S (y) = * 0 0 + dbfn_read: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S + dbfn_read: null return failing_interval=ttt message_age=ttt on queue longer than maximum retry -Writing retry data for T:V4NET.0.0.0:V4NET.0.0.0:PORT_S +Writing retry data for T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S first failed=dddd last try=dddd next try=+0 expired=0 errno=dd more_errno=dd,A Network Error - dbfn_write: key=T:V4NET.0.0.0:V4NET.0.0.0:PORT_S + dbfn_write: key=T:[V4NET.0.0.0]:V4NET.0.0.0:PORT_S datalen NNN timed out: all retries expired LOG: MAIN ** x@y: retry timeout exceeded EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile end of retry processing -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 +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-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 configuration file is TESTSUITE/test-config @@ -215,46 +218,47 @@ X-Failed-Recipients: x@y Auto-Submitted: auto-replied From: Mail Delivery System To: CALLER@myhost.test.ex -References: +References: Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM MIME-Version: 1.0 Subject: Mail delivery failed: returning message to sender qualify & rewrite recipients list -global rewrite rules -rewrite headers +rewrite rules on sender address +qualify and 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 - Auto-Submitted: auto-replied -F From: Mail Delivery System -T To: CALLER@myhost.test.ex - References: - Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM - MIME-Version: 1.0 - Subject: Mail delivery failed: returning message to sender -I Message-Id: - Date: Tue, 2 Mar 1999 09:44:33 +0000 + X-Failed-Recipients: x@y + Auto-Submitted: auto-replied + F From: Mail Delivery System + T To: CALLER@myhost.test.ex + References: + Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM + MIME-Version: 1.0 + Subject: Mail delivery failed: returning message to sender + I Message-Id: + Date: Tue, 2 Mar 1999 09:44:33 +0000 -Data file name: TESTSUITE/spool//input//10HmaY-0005vi-00-D -Data file written for message 10HmaY-0005vi-00 +Data file name: TESTSUITE/spool//input//10HmaY-000000005vi-0000-D +Data file written for message 10HmaY-000000005vi-0000 >>Generated Received: header line P Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz) - id 10HmaY-0005vi-00 + id 10HmaY-000000005vi-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 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaY-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaY-000000005vi-0000-H Size of headers = sss LOG: MAIN - <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss + <= <> R=10HmaX-000000005vi-0000 U=EXIMUSER P=local S=sss search_tidyup called -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -MCd local-accept-delivery -odi -Mc 10HmaY-000000005vi-0000 Exim version x.yz .... +Hints DB: changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1237 configuration file is TESTSUITE/test-config @@ -262,7 +266,7 @@ trusted user admin user dropping to exim gid; retaining priv uid set_process_info: pppp delivering specified messages -set_process_info: pppp delivering 10HmaY-0005vi-00 +set_process_info: pppp delivering 10HmaY-000000005vi-0000 locking TESTSUITE/spool/db/retry.lockfile locked TESTSUITE/spool/db/retry.lockfile EXIM_DBOPEN: file dir flags=O_RDONLY @@ -272,8 +276,11 @@ set_process_info: pppp delivering 10HmaY-0005vi-00 Considering: CALLER@myhost.test.ex unique = CALLER@myhost.test.ex dbfn_read: key=R:myhost.test.ex + dbfn_read: null return dbfn_read: key=R:CALLER@myhost.test.ex + dbfn_read: null return dbfn_read: key=R:CALLER@myhost.test.ex:<> + dbfn_read: null return no domain retry record no address retry record CALLER@myhost.test.ex: queued for routing @@ -284,14 +291,14 @@ routing CALLER@myhost.test.ex --------> r0 router <-------- local_part=CALLER domain=myhost.test.ex checking local_parts -CALLER in "CALLER"? +CALLER in local_parts? list element: CALLER - CALLER in "CALLER"? yes (matched "CALLER") + CALLER in local_parts? yes (matched "CALLER") checking senders - in ":"? + in senders? list element: address match test: subject= pattern= - in ":"? yes (matched "") + in senders? yes (matched "") calling r0 router rda_interpret (string): ':blackhole:' expanded: ':blackhole:' @@ -310,7 +317,7 @@ After routing: search_tidyup called changed uid/gid: post-delivery tidying uid=EXIM_UID gid=EXIM_GID pid=p1237 -set_process_info: pppp tidying up after delivering 10HmaY-0005vi-00 +set_process_info: pppp tidying up after delivering 10HmaY-000000005vi-0000 Processing retry items Succeeded addresses: CALLER@myhost.test.ex: no retry items @@ -324,8 +331,8 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1237 (local-accept-delivery) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called >>>>>>>>>>>>>>>> Exim pid=p1236 (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 +Writing spool header file: TESTSUITE/spool//input//hdr.10HmaX-000000005vi-0000 +Renaming spool header file: TESTSUITE/spool//input//10HmaX-000000005vi-0000-H Size of headers = sss LOG: MAIN Completed