DMARC: expand main-config options. Bug 3102

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

diff --git a/test/mail/1110.userx b/test/mail/1110.userx
index ad6260fcce2cc81397ebba775361739315ab9aa0..2b7e6db5d0b4b57661e38742de9b773514c91847 100644 (file)
--- a/test/mail/1110.userx
+++ b/test/mail/1110.userx
@@ -3,7 +3,7 @@ Received: from [127.0.0.1] (helo=rhu.barb)
        by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        by myhost.test.ex with esmtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)

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

        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn ''
        for userx@test.ex;
        Tue, 2 Mar 1999 09:44:33 +0000
 TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn ''


@@ -11,14 +11,14 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn ''
 This is a test encrypted message.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999
 This is a test encrypted message.
 
 From userx@test.ex Tue Mar 02 09:44:33 1999

-Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtp (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
+Received: from [ip4.ip4.ip4.ip4] (helo=test)
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (envelope-from <userx@test.ex>)
        (Exim x.yz)
        (envelope-from <userx@test.ex>)

-       id 10HmaY-0005vi-00
+       id 10HmaY-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

-TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn 'CN=Phil Pennock'
+TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn/cn 'CN=server2.example.org'

 
 This is a test encrypted message from a verified host.
 
 
 This is a test encrypted message from a verified host.