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 791bbc63d2bbd98aa3532df9acf77b89906ccec3..9a8fd27b7ae1cbcc59cdbef0b02832fdad55d494 100644 (file)
--- a/test/mail/0021.userx
+++ b/test/mail/0021.userx
@@ -1,14 +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 10HmbD-0005vi-00
+       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-0005vi-00@myhost.test.ex>
+References: <E10HmaY-000000005vi-0000@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbD-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
@@ -20,10 +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 10HmaY-0005vi-00
+       id 10HmaY-000000005vi-0000
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaY-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmaY-000000005vi-0000@myhost.test.ex>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -32,10 +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 10HmbE-0005vi-00
+       id 10HmbE-000000005vi-0000
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbE-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbE-000000005vi-0000@myhost.test.ex>
 From: ok@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -44,10 +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 10HmbG-0005vi-00
+       id 10HmbG-000000005vi-0000
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbG-000000005vi-0000@myhost.test.ex>
 From: ok@test3
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
@@ -55,15 +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 10HmbJ-0005vi-00
+       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-0005vi-00@myhost.test.ex>
+References: <E10HmbB-000000005vi-0000@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbJ-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
@@ -73,15 +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 10HmbK-0005vi-00
+       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-0005vi-00@myhost.test.ex>
+References: <E10HmbC-000000005vi-0000@myhost.test.ex>
 Subject: Mail failure - rejected by local scanning code
-Message-Id: <E10HmbK-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
@@ -94,10 +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 10HmbC-0005vi-00
+       id 10HmbC-000000005vi-0000
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmbC-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbC-000000005vi-0000@myhost.test.ex>
 From: userx@test1
 Date: Tue, 2 Mar 1999 09:44:33 +0000