DMARC: expand main-config options. Bug 3102

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

diff --git a/test/mail/0026.userx b/test/mail/0026.userx
index 21b9abc156c1517b35908b4d155e734182f1f1c9..633df6e0ade62c0c5a62077f26142704ffdf9e3e 100644 (file)
--- a/test/mail/0026.userx
+++ b/test/mail/0026.userx
@@ -1,10 +1,11 @@
 From x@y Tue Mar 02 09:44:33 1999
 From x@y 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 <x@y>)
        (envelope-from <x@y>)

-       id 10HmbF-0005vi-00
+       id 10HmbF-000000005vi-0000

        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000

-Message-Id: <E10HmbF-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbF-000000005vi-0000@myhost.test.ex>

 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning


@@ -12,14 +13,15 @@ X-warning: this is a test warning
 Message 7
 
 From x@y Tue Mar 02 09:44:33 1999
 Message 7
 
 From x@y 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 <x@y>)
        (envelope-from <x@y>)

-       id 10HmbG-0005vi-00
+       id 10HmbG-000000005vi-0000

        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 to: group name: x@y, p@q;
 reply-to: group name: a@b, c@d;
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 to: group name: x@y, p@q;
 reply-to: group name: a@b, c@d;

-Message-Id: <E10HmbG-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbG-000000005vi-0000@myhost.test.ex>

 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 From: x@y
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning


@@ -27,14 +29,15 @@ X-warning: this is a test warning
 Message 10
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Message 10
 
 From MAILER-DAEMON Tue Mar 02 09:44:33 1999

-Received: from CALLER by myhost.test.ex with local-smtp (Exim x.yz)
-       id 10HmbH-0005vi-00
+Received: from CALLER (helo=test)
+       by myhost.test.ex with local-smtp (Exim x.yz)
+       id 10HmbH-000000005vi-0000

        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 to: group name: x@y, p@q;
 reply-to: group name:;
 from: userx@test.ex
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 to: group name: x@y, p@q;
 reply-to: group name:;
 from: userx@test.ex

-Message-Id: <E10HmbH-0005vi-00@myhost.test.ex>
+Message-Id: <E10HmbH-000000005vi-0000@myhost.test.ex>

 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning
 
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 X-warning: this is a test warning