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 0a2adcf1c64a8b3e1061bc7695969238bf187007..4f381035621327dbd960bc1c5485af7cd5cb00f6 100644 (file)
--- a/test/mail/2102.CALLER
+++ b/test/mail/2102.CALLER
@@ -1,24 +1,49 @@
-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]
 Received: from [127.0.0.1]

-       by myhost.test.ex with smtps (TLSv1:AES256-SHA:256)
+       by myhost.test.ex with smtps (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

        (Exim x.yz)
        (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

-TLS: cipher=TLSv1:AES256-SHA:256 peerdn=
+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
-Received: from [ip4.ip4.ip4.ip4]
-       by myhost.test.ex with smtps (TLSv1:AES256-SHA:256)
+From "name with spaces"@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)
        (Exim x.yz)

-       (envelope-from <CALLER@test.ex>)
+       (envelope-from <"name with spaces"@test.ex>)

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

+tls-certificate-verified: 0
+TLS: cipher=TLS1.x:ke-RSA-AES256-SHAnnn:xxx peerdn=
+
+This is a test encrypted message.
+
+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)
+       (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
 tls-certificate-verified: 1

-TLS: cipher=TLSv1:AES256-SHA:256 peerdn=/C=UK/O=The Exim Maintainers/OU=Test Suite/CN=Phil Pennock
+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 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)
+       (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
+TLS: cipher=TLS1.x:ke-ECDSA-AES256-SHAnnn:xxx peerdn=
+
+This is a test encrypted message.
+It should be sent under the EC server cert and with an ECDSA cipher.
+