Make the retry_include_ip_address smtp transport option expanded. Bug 1545

[users/heiko/exim.git] / test / stdout / 2102

diff --git a/test/stdout/2102 b/test/stdout/2102
index 23c39cdf4e041a7b1b743d8316ea4cd69920db3e..965b7dddb827a8158b36ac67512215f442d42826 100644 (file)
--- a/test/stdout/2102
+++ b/test/stdout/2102
@@ -20,10 +20,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization

-SSL info: SSLv2/v3 write client hello A

 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A

-SSL info: SSLv3 read server key exchange A

 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A


@@ -74,10 +72,8 @@ Connecting to 127.0.0.1 port 1225 ... connected
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization

-SSL info: SSLv2/v3 write client hello A

 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A

-SSL info: SSLv3 read server key exchange A

 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client key exchange A
 SSL info: SSLv3 write change cipher spec A


@@ -128,10 +124,8 @@ Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization

-SSL info: SSLv2/v3 write client hello A

 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A

-SSL info: SSLv3 read server key exchange A

 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A


@@ -145,8 +139,8 @@ pppp:error:14094410:SSL routines:SSL3_READ_BYTES:sslv3 alert handshake failure:s
 Failed to start TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected
 Failed to start TLS
 End of script
 Connecting to ip4.ip4.ip4.ip4 port 1225 ... connected

-Certificate file = TESTSUITE/aux-fixed/cert2
-Key file = TESTSUITE/aux-fixed/cert2
+Certificate file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.pem
+Key file = TESTSUITE/aux-fixed/exim-ca/example.com/server2.example.com/server2.example.com.unlocked.key

 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo rhu.barb
 ??? 220
 <<< 220 myhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> ehlo rhu.barb


@@ -168,10 +162,8 @@ Key file = TESTSUITE/aux-fixed/cert2
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization
 Attempting to start TLS
 SSL info: before/connect initialization
 SSL info: before/connect initialization

-SSL info: SSLv2/v3 write client hello A

 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A
 SSL info: SSLv3 read server hello A
 SSL info: SSLv3 read server certificate A

-SSL info: SSLv3 read server key exchange A

 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A
 SSL info: SSLv3 read server certificate request A
 SSL info: SSLv3 read server done A
 SSL info: SSLv3 write client certificate A