X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bfe645c1570343d3adca657ab67998e122ca8792..159cf206c97f876b07829d92db2217689745c1e8:/test/mail/0226.CALLER

diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index 6fdc064f2..e8425b6de 100644
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -2,11 +2,12 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-X-Failed-Recipients: |/p/q/r@no.test.ex,
-  /a/b/c@no.test.ex
+X-Failed-Recipients: pipe1@no.test.ex,
+  file1@no.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaX-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -22,9 +23,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   pipe to |/p/q/r
-    generated by |/p/q/r@no.test.ex
+    generated by pipe1@no.test.ex
   save to /a/b/c
-    generated by /a/b/c@no.test.ex
+    generated by file1@no.test.ex
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
@@ -32,11 +33,11 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;/a/b/c
+Final-Recipient: rfc822;file1@no.test.ex
 Status: 5.0.0
 
 Action: failed
-Final-Recipient: rfc822;|/p/q/r
+Final-Recipient: rfc822;pipe1@no.test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -58,10 +59,11 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-X-Failed-Recipients: |TESTSUITE/aux-fixed/showenv@yes.test.ex
+X-Failed-Recipients: pipe2@yes.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
+References: <E10HmaZ-0005vi-00@the.local.host.name>
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender
@@ -77,12 +79,12 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   pipe to |TESTSUITE/aux-fixed/showenv
-    generated by |TESTSUITE/aux-fixed/showenv@yes.test.ex
+    generated by pipe2@yes.test.ex
 
 The following text was generated during the delivery attempt:
 
 ------ pipe to |TESTSUITE/aux-fixed/showenv
-       generated by |TESTSUITE/aux-fixed/showenv@yes.test.ex ------
+       generated by pipe2@yes.test.ex ------
 
 Test pipe script
 Running as: CALLER
@@ -97,18 +99,18 @@ C=
 COLON=
 DOMAIN=yes.test.ex
 HOME=
-LOCAL_PART=|TESTSUITE/aux-fixed/showenv
+LOCAL_PART=pipe2
 LOCAL_PART_PREFIX=
 LOCAL_PART_SUFFIX=
-LOGNAME=|TESTSUITE/aux-fixed/showenv
+LOGNAME=pipe2
 ME=
 MESSAGE_ID=10HmaZ-0005vi-00
 PATH=/bin:/usr/bin
 QUALIFY_DOMAIN=test.ex
-RECIPIENT=|TESTSUITE/aux-fixed/showenv@yes.test.ex
+RECIPIENT=pipe2@yes.test.ex
 SENDER=CALLER@test.ex
 SHELL=/bin/sh
-USER=|TESTSUITE/aux-fixed/showenv
+USER=pipe2
 ----------cat-----------
 >From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -128,7 +130,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv
+Final-Recipient: rfc822;pipe2@yes.test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM