DMARC: expand main-config options. Bug 3102

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

diff --git a/test/mail/0220.userx b/test/mail/0220.userx
index 0eadbaa4162868ff2121aa17993a252cf18641b4..49a77d537259cf1fc40ffe19090a597e8293e9c3 100644 (file)
--- a/test/mail/0220.userx
+++ b/test/mail/0220.userx
@@ -1,9 +1,10 @@
 From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
-       id 10HmaY-0005vi-00
-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+       id 10HmaY-000000005vi-0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -12,20 +13,23 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
-       id 10HmaZ-0005vi-00
-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaZ-0005vi-00@myhost.test.ex>
+       id 10HmaZ-000000005vi-0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaZ-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 
 From foo@bar Tue Mar 02 09:44:33 1999
-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
        (envelope-from <foo@bar>)
-       id 10HmbA-0005vi-00
-       for userx@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbA-0005vi-00@myhost.test.ex>
+       id 10HmbA-000000005vi-0000
+       for userx@test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbA-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <foo@bar>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
@@ -34,10 +38,11 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From foo@bar Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <foo@bar>)
-       id 10HmbB-0005vi-00
-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmbB-000000005vi-0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
 From: foobydooby <foo@bar>
-Message-Id: <E10HmbB-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbB-000000005vi-0000@myhost.test.ex>
 Sender: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -45,9 +50,10 @@ Date: Tue, 2 Mar 1999 09:44:33 +0000
 From CALLER@myhost.test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <CALLER@myhost.test.ex>)
-       id 10HmbF-0005vi-00
-       for userx@myhost.test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+       id 10HmbF-000000005vi-0000
+       for userx@myhost.test.ex;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmbF-000000005vi-0000@myhost.test.ex>
 From: CALLER_NAME <CALLER@myhost.test.ex>
 Date: Tue, 2 Mar 1999 09:44:33 +0000