DMARC: expand main-config options. Bug 3102

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

diff --git a/test/mail/0097.userx b/test/mail/0097.userx
index 299a89e322ce528a3cdc701525c0f95d1afac804..f6d026eb7026c3d83694dada638447d1f248653f 100644 (file)
--- a/test/mail/0097.userx
+++ b/test/mail/0097.userx
@@ -4,12 +4,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmaX-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@the.local.host.name>
+       id 10HmaX-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Subject: First message subject
 Subject: First message subject

+Message-Id: <E10HmaX-000000005vi-0000@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999
 
 
 From CALLER@test.ex Tue Mar 02 09:44:33 1999


@@ -18,12 +19,13 @@ Envelope-to: userx@test.ex
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)
 Delivery-date: Tue, 2 Mar 1999 09:44:33 +0000
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
        (envelope-from <CALLER@test.ex>)

-       id 10HmaY-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Date: Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@the.local.host.name>
+       id 10HmaY-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000

 X-RBL-Warning: A faked up RBL header
 X-RBL-Warning: A faked up RBL header

+Message-Id: <E10HmaY-000000005vi-0000@the.local.host.name>

 From: CALLER_NAME <CALLER@test.ex>
 From: CALLER_NAME <CALLER@test.ex>

+Date: Tue, 2 Mar 1999 09:44:33 +0000

 Added: by router
 Added: by transport
 
 Added: by router
 Added: by transport