git://git.exim.org / exim.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Fix mismerge
[exim.git] / test / mail / 0266.postmaster
diff --git a/test/mail/0266.postmaster b/test/mail/0266.postmaster
index 068b0706ca983cb4beff442caaf66b46084234f2..52addaebea3e3df640b3d1d38d94c0e35d7cf4e4 100644 (file)
--- a/test/mail/0266.postmaster
+++ b/test/mail/0266.postmaster
@@ -2,17 +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)
 Return-path: <>
 Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmaY-0005vi-00
+       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
        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
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-References: <E10HmaX-0005vi-00@myhost.test.ex>
+References: <E10HmaX-000000005vi-0000@myhost.test.ex>
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -24,17 +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)
 Return-path: <>
 Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmbA-0005vi-00
+       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
        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
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-References: <E10HmaZ-0005vi-00@myhost.test.ex>
+References: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
 The r1 router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -46,41 +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)
 Return-path: <>
 Envelope-to: postmaster@test.ex
 Received: from root by myhost.test.ex with local (Exim x.yz)
-       id 10HmbC-0005vi-00
+       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
        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>
+Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
-References: <E10HmbB-0005vi-00@myhost.test.ex>
-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>
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-
-References: <E10HmbD-0005vi-00@myhost.test.ex>
+References: <E10HmbB-000000005vi-0000@myhost.test.ex>
 The r1a router encountered the following error(s):
 
   domain missing or malformed in the address
 The r1a router encountered the following error(s):
 
   domain missing or malformed in the address
@@ -88,51 +64,3 @@ The r1a router encountered the following error(s):
 
 No valid addresses were generated.
 
 
 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
-
-References: <E10HmbG-0005vi-00@myhost.test.ex>
-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
-
-References: <E10HmbI-0005vi-00@myhost.test.ex>
-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 "test-private": Permission denied (euid=CALLER_UID egid=CALLER_GID)
-
-No valid addresses were generated.
-
Master Exim source repository