Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / mail / 2102.CALLER

diff --git a/test/mail/2102.CALLER b/test/mail/2102.CALLER
index 9ca82395f6fc427654c35a1fbc65820f5440aa42..4f381035621327dbd960bc1c5485af7cd5cb00f6 100644 (file)
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,8 +1,8 @@
-From CALLER@test.ex Tue Mar 02 09:44:33 1999
+From a@test.ex Tue Mar 02 09:44:33 1999

 Received: from [127.0.0.1]
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
 Received: from [127.0.0.1]
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
+       (envelope-from <a@test.ex>)

        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
        id 10HmaX-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0


@@ -22,11 +22,11 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
 
 This is a test encrypted message.
 
 
 This is a test encrypted message.
 

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

 Received: from [ip4.ip4.ip4.ip4]
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
 Received: from [ip4.ip4.ip4.ip4]
        by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)
        (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
+       (envelope-from <b@test.ex>)

        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1
        id 10HmaZ-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 1


@@ -34,11 +34,11 @@ TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=/CN=server2.example.com
 
 This is a test encrypted message from a verified host.
 
 
 This is a test encrypted message from a verified host.
 

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

 Received: from [127.0.0.1]
        by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
        (Exim x.yz)
 Received: from [127.0.0.1]
        by myhost.test.ex with smtps (TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx)
        (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
+       (envelope-from <c@test.ex>)

        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0
        id 10HmbA-0005vi-00
        for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
 tls-certificate-verified: 0