DMARC: expand main-config options. Bug 3102

[exim.git] / test / mail / 0021.userx

diff --git a/test/mail/0021.userx b/test/mail/0021.userx
index 2abd8d3150adc6474e3b389cb3fcfacf84ee8021..9a8fd27b7ae1cbcc59cdbef0b02832fdad55d494 100644 (file)
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -1,12 +1,14 @@
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbC-0005vi-00
-       for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbD-000000005vi-0000
+       for userx@test1;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmaY-000000005vi-0000@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbD-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
@@ -18,9 +20,10 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <userx@test1>)
-       id 10HmaX-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+       id 10HmaY-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -29,9 +32,10 @@ Test message 1.
 From ok@test1 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test1>)
-       id 10HmbD-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbD-0005vi-00@myhost.test.ex>
+       id 10HmbE-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbE-000000005vi-0000@myhost.test.ex>
 From: ok@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -40,9 +44,10 @@ Test message 2.
 From ok@test3 Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test3>)
-       id 10HmbF-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+       id 10HmbG-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbG-000000005vi-0000@myhost.test.ex>
 From: ok@test3
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -50,13 +55,15 @@ Test message 4.
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbI-0005vi-00
-       for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbJ-000000005vi-0000
+       for userx@test1;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmbB-000000005vi-0000@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbI-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbJ-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
@@ -66,13 +73,15 @@ checks incoming messages on this system. The following error was given:
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by myhost.test.ex with local (Exim x.yz)
-       id 10HmbJ-0005vi-00
-       for userx@test1; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbK-000000005vi-0000
+       for userx@test1;
+       Tue, 2 Mar 1999 09:44:33 +0000
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: userx@test1
+References: <E10HmbC-000000005vi-0000@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbJ-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbK-000000005vi-0000@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 A message that you sent was rejected by the local scanning code that
@@ -85,9 +94,10 @@ checks incoming messages on this system. The following error was given:
 
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <userx@test1>)
-       id 10HmbB-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+       id 10HmbC-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000