fix doubled logging of message_id

[exim.git] / test / stdout / 5610

diff --git a/test/stdout/5610 b/test/stdout/5610
index f1e728ba0befdd74bdb4e93cd12d7b1f056288ca..7dbadc46e0a7c6a749d7631c003c1c7a632eb9e9 100644 (file)
--- a/test/stdout/5610
+++ b/test/stdout/5610
@@ -20,9 +20,11 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-Response verify OK
-SSL connection using ke-RSA-AES256-SHAxxx
-Succeeded in starting TLS
+OCSP status response: good signature
+Succeeded in starting TLS (with OCSP)
+>>> helo test
+??? 250
+<<< 250 server1.example.com Hello test [ip4.ip4.ip4.ip4]

 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK
 >>> mail from:<userx@test.ex>
 ??? 250
 <<< 250 OK


@@ -55,9 +57,8 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-no response received
-SSL connection using ke-RSA-AES256-SHAxxx
-Succeeded in starting TLS
+no OCSP response received
+Succeeded in starting TLS (with OCSP)

 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2


@@ -81,9 +82,8 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-no response received
-SSL connection using ke-RSA-AES256-SHAxxx
-Succeeded in starting TLS
+no OCSP response received
+Succeeded in starting TLS (with OCSP)

 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Certificate file = aux-fixed/cert2


@@ -107,7 +107,6 @@ Key file = aux-fixed/cert2
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS

-SSL connection using ke-RSA-AES256-SHAxxx

 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-
 Succeeded in starting TLS
 >>> ehlo rhu.barb.tls
 ??? 250-