Fix mismerge

[exim.git] / test / mail / 3700.x

diff --git a/test/mail/3700.x b/test/mail/3700.x
index e77cdbae8d1b46687f581a1c8f1ed7044f981f69..57abd8783196dc3be6464bff7f5ad5bbc303b691 100644 (file)
--- a/test/mail/3700.x
+++ b/test/mail/3700.x
@@ -1,18 +1,20 @@
 From ok@test.ex Tue Mar 02 09:44:33 1999
 Authentication-Results: myhost.test.ex;
        iprev=pass (localhost) smtp.remote-ip=127.0.0.1;
 From ok@test.ex Tue Mar 02 09:44:33 1999
 Authentication-Results: myhost.test.ex;
        iprev=pass (localhost) smtp.remote-ip=127.0.0.1;

-       auth=pass (tls) x509.auth="Phil Pennock"
+       auth=pass (tls) x509.auth=server2.example.org

 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)
 Received: from localhost ([127.0.0.1] helo=myhost.test.ex)

-       by myhost.test.ex with esmtpsa  (TLS_proto_and_cipher) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384
+       by myhost.test.ex with esmtpsa (TLS1.x:ke-RSA-AES256-SHAnnn:xxx)

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

-       id 10HmaZ-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
+       id 10HmaZ-000000005vi-0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000

 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test.ex>)
 Received: from CALLER by myhost.test.ex with local (Exim x.yz)
        (envelope-from <ok@test.ex>)

-       id 10HmaX-0005vi-00
-       for x@y; Tue, 2 Mar 1999 09:44:33 +0000
-Message-Id: <E10HmaX-0005vi-00@myhost.test.ex>
+       id 10HmaX-000000005vi-0000
+       for x@y;
+       Tue, 2 Mar 1999 09:44:33 +0000
+Message-Id: <E10HmaX-000000005vi-0000@myhost.test.ex>

 From: ok@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000
 
 From: ok@test.ex
 Date: Tue, 2 Mar 1999 09:44:33 +0000