X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/caf28f95ce0a617b075cf66e24a0e4b0b8aaf18e..67cc3ad2fe09fa6197c54a18fa9eb8f1375a87ec:/test/stderr/0388 diff --git a/test/stderr/0388 b/test/stderr/0388 index f3a48e5fc..dd3dc3eec 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -5,7 +5,7 @@ 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 @@ -75,7 +75,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,7 +84,7 @@ 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) +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 @@ -93,9 +93,6 @@ Connecting to 127.0.0.1 [127.0.0.1]:PORT_S ... 127.0.0.1 in hosts_try_fastopen? 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 @@ -112,7 +109,7 @@ cmd buf flush ddd bytes (more expected) 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 +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 +126,26 @@ 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) +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 +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-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: 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 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: @@ -194,7 +191,7 @@ LOG: MAIN 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 .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1236 @@ -215,7 +212,7 @@ 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 @@ -233,27 +230,27 @@ search_tidyup called Auto-Submitted: auto-replied F From: Mail Delivery System T 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 -I Message-Id: +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 .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=p1237 @@ -262,7 +259,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 @@ -310,7 +307,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 +321,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