Fix bogus error message copy. Bug 2857

[exim.git] / test / mail / 4700.CALLER

diff --git a/test/mail/4700.CALLER b/test/mail/4700.CALLER
index bde98db7d755278023d6676fc3eb0de1b779cab3..378b05d7e4107a78f04fa0811a76037513eb2d65 100644 (file)
--- a/test/mail/4700.CALLER
+++ b/test/mail/4700.CALLER
@@ -2,11 +2,13 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmaY-0005vi-00
 Return-path: <>
 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
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Failed-Recipients: userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 X-Failed-Recipients: userx@domain1
 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
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender


@@ -47,7 +49,8 @@ Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
        id 10HmaX-0005vi-00

-       for userx@domain1; Tue, 2 Mar 1999 09:44:33 +0000
+       for userx@domain1;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000


@@ -60,12 +63,14 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
        id 10HmbA-0005vi-00
 Return-path: <>
 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
+       for CALLER@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-Failed-Recipients: usery@domain2,
   userx@domain1
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
 X-Failed-Recipients: usery@domain2,
   userx@domain1
 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
 Content-Type: multipart/report; report-type=delivery-status; boundary=NNNNNNNNNN-eximdsn-MMMMMMMMMM
 MIME-Version: 1.0
 Subject: Mail delivery failed: returning message to sender


@@ -120,7 +125,8 @@ Content-type: message/rfc822
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Return-path: <CALLER@test.ex>
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmaZ-0005vi-00; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-0005vi-00;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 Message-Id: <E10HmaZ-0005vi-00@the.local.host.name>
 From: CALLER_NAME <CALLER@test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000