Fix mismerge

[exim.git] / test / mail / 0270.postmaster

diff --git a/test/mail/0270.postmaster b/test/mail/0270.postmaster
index 3a6d439230e8bb72437da5a665250ed87288c46b..52addaebea3e3df640b3d1d38d94c0e35d7cf4e4 100644 (file)
--- a/test/mail/0270.postmaster
+++ b/test/mail/0270.postmaster
@@ -2,15 +2,17 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmaY-0005vi-00
-       for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaY-000000005vi-0000
+       for postmaster@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmaX-000000005vi-0000@myhost.test.ex>
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -22,15 +24,17 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmbA-0005vi-00
-       for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbA-000000005vi-0000
+       for postmaster@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -42,37 +46,17 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Return-path: <>
 Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmbC-0005vi-00
-       for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbC-000000005vi-0000
+       for postmaster@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: postmaster@test.ex
 Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-There's an error in your filter file.
-The file has been ignored.
-
-The r2 router encountered the following error(s):
-
-  unknown filtering command "syntax" near line 3 of filter file
-
-No valid addresses were generated.
-
-From MAILER-DAEMON Tue Mar 02 09:44:33 1999
-Return-path: <>
-Envelope-to: postmaster@test.ex
-Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmbE-0005vi-00
-       for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Auto-Submitted: auto-replied
-From: Mail Delivery System <Mailer-Daemon@test.ex>
-To: postmaster@test.ex
-Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
+References: <E10HmbB-000000005vi-0000@myhost.test.ex>
 The r1a router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -80,47 +64,3 @@ The r1a router encountered the following error(s):
 
 No valid addresses were generated.
 
-From MAILER-DAEMON Tue Mar 02 09:44:33 1999
-Return-path: <>
-Envelope-to: postmaster@test.ex
-Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmbH-0005vi-00
-       for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Auto-Submitted: auto-replied
-From: Mail Delivery System <Mailer-Daemon@test.ex>
-To: postmaster@test.ex
-Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-There's an error in your filter file.
-The file has been ignored.
-
-The r2 router encountered the following error(s):
-
-  malformed address "@@in.valid" in filter file: domain missing or malformed
-
-No valid addresses were generated.
-
-From MAILER-DAEMON Tue Mar 02 09:44:33 1999
-Return-path: <>
-Envelope-to: postmaster@test.ex
-Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmbJ-0005vi-00
-       for postmaster@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Auto-Submitted: auto-replied
-From: Mail Delivery System <Mailer-Daemon@test.ex>
-To: postmaster@test.ex
-Subject: error(s) in forwarding or filtering
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-There's an error in your filter file.
-The file has been ignored.
-
-The r2 router encountered the following error(s):
-
-  failed to open filter log file "TESTSUITE/test-private": Permission denied (euid=CALLER_UID egid=CALLER_GID)
-
-No valid addresses were generated.
-