X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/1813a1e0320e30edfbb7ca7db2063cf63a366ca5..6397b292615a5ffb9fdb5bd305736e2ef5f00e0d:/test/stderr/0388?ds=inline diff --git a/test/stderr/0388 b/test/stderr/0388 index 2e707cf85..4d0629788 100644 --- a/test/stderr/0388 +++ b/test/stderr/0388 @@ -3,6 +3,7 @@ changed uid/gid: forcing real = effective uid=uuuu gid=CALLER_GID pid=pppp 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 locking TESTSUITE/spool/db/retry.lockfile @@ -15,8 +16,8 @@ no retry data available >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> Considering: x@y unique = x@y -no domain retry record -no address retry record +no domain retry record +no address retry record x@y: queued for routing >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> routing x@y @@ -32,8 +33,8 @@ r1 router called for x@y domain = y route_item = * "127.0.0.1 : V4NET.0.0.0" y in "*"? yes (matched "*") -original list of hosts = "127.0.0.1 : V4NET.0.0.0" options = -expanded list of hosts = "127.0.0.1 : V4NET.0.0.0" options = +original list of hosts = '127.0.0.1 : V4NET.0.0.0' options = '' +expanded list of hosts = '127.0.0.1 : V4NET.0.0.0' options = '' set transport smtp finding IP address for 127.0.0.1 calling host_find_byname @@ -80,8 +81,8 @@ checking 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] (x@y) -Connecting to 127.0.0.1 [127.0.0.1]:1224 ... connected +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]:1224 ... connected SMTP<< 220 Server ready 127.0.0.1 in hosts_avoid_esmtp? no (option unset) SMTP>> EHLO myhost.test.ex @@ -100,7 +101,7 @@ added retry item for R:x@y: errno=-44 more_errno=dd,A flags=0 SMTP>> QUIT cmd buf flush ddd bytes SMTP(close)>> -set_process_info: pppp delivering 10HmaX-0005vi-00: just tried 127.0.0.1 [127.0.0.1] for x@y: result OK +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 "*") @@ -113,11 +114,11 @@ checking 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] (x@y) -Connecting to V4NET.0.0.0 [V4NET.0.0.0]:1224 ... failed: Network Error +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]:1224 ... 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] for x@y: result DEFER +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 (just run smtp for x@y in subprocess) search_tidyup called @@ -168,7 +169,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=0xebb95ced -odi -odi -t -oem -oi -f <> -E10HmaX-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -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 @@ -189,6 +190,7 @@ X-Failed-Recipients: x@y Auto-Submitted: auto-replied From: Mail Delivery System 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 @@ -203,6 +205,7 @@ search_tidyup called 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 @@ -215,19 +218,20 @@ Data file written for message 10HmaY-0005vi-00 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 -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +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 -exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xebb95ced -odi -Mc 10HmaY-0005vi-00 +exec TESTSUITE/eximdir/exim -DEXIM_PATH=TESTSUITE/eximdir/exim -C TESTSUITE/test-config -d=0xd7715ced -odi -Mc 10HmaY-0005vi-00 Exim version x.yz .... changed uid/gid: forcing real = effective uid=uuuu gid=EXIM_GID pid=pppp configuration file is TESTSUITE/test-config 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 locking TESTSUITE/spool/db/retry.lockfile @@ -241,8 +245,8 @@ unique = CALLER@myhost.test.ex dbfn_read: key=R:myhost.test.ex dbfn_read: key=R:CALLER@myhost.test.ex dbfn_read: key=R:CALLER@myhost.test.ex:<> -no domain retry record -no address retry record +no domain retry record +no address retry record CALLER@myhost.test.ex: queued for routing EXIM_DBCLOSE(0xAAAAAAAA) closed hints database and lockfile @@ -256,8 +260,8 @@ checking senders address match test: subject= pattern= in ":"? yes (matched "") calling r0 router -rda_interpret (string): :blackhole: -expanded: :blackhole: +rda_interpret (string): ':blackhole:' +expanded: ':blackhole:' file is not a filter file parse_forward_list: :blackhole: extract item: :blackhole: @@ -287,7 +291,7 @@ search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> search_tidyup called >>>>>>>>>>>>>>>> Exim pid=pppp (main) terminating with rc=0 >>>>>>>>>>>>>>>> -Writing spool header file: TESTSUITE/spool//input//hdr.pppp +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 LOG: MAIN