X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/8b4556856d2434c8006df5011d4855c07a7ba2b8..8cfc4d82fc84825b3a673aa140fc561042e32b70:/test/stderr/0388?ds=sidebyside

diff --git a/test/stderr/0388 b/test/stderr/0388
index 3b6448d89..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
@@ -81,7 +82,7 @@ checking status of 127.0.0.1
 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]:1224 ... connected
+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
@@ -114,7 +115,7 @@ checking status of V4NET.0.0.0
 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]:1224 ... failed: Network Error
+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]:PORT_S for x@y: result DEFER
@@ -189,6 +190,7 @@ X-Failed-Recipients: x@y
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@myhost.test.ex>
 To: CALLER@myhost.test.ex
+References: <E10HmaX-0005vi-00@myhost.test.ex>
 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 <Mailer-Daemon@myhost.test.ex>
 T To: CALLER@myhost.test.ex
+  References: <E10HmaX-0005vi-00@myhost.test.ex>
   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,7 +218,7 @@ 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
@@ -228,6 +231,7 @@ changed uid/gid: forcing real = effective
 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