Change the default for hosts_noproxy_tls to unset, enabling continued-TLS deliveries...

[exim.git] / test / stdout / 2190

diff --git a/test/stdout/2190 b/test/stdout/2190
index 7942a8ce5451d1f7e526cf7ce5730b5612a5f5a8..6b09a37131b431ecfea952b96d34128be4cf6426 100644 (file)
--- a/test/stdout/2190
+++ b/test/stdout/2190
@@ -1,9 +1,9 @@
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -20,24 +20,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate 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 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHAnnn
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -51,7 +38,7 @@ Succeeded in starting TLS
 >>> MAIL FROM:<someone@some.domain>
 ??? 250
 <<< 250 OK
->>> RCPT TO:<CALLER@the.local.host.name>
+>>> RCPT TO:<CALLER@test.ex>
 ??? 250
 <<< 250 Accepted
 >>> BDAT 88 LAST
@@ -65,14 +52,14 @@ Succeeded in starting TLS
 <<< 250 OK id=10HmaX-0005vi-00
 >>> QUIT
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script
 Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
-<<< 220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
+<<< 220 testhost.test.ex ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -89,24 +76,11 @@ Connecting to 127.0.0.1 port 1225 ... connected
 ??? 220
 <<< 220 TLS go ahead
 Attempting to start TLS
-SSL info: before/connect initialization
-SSL info: before/connect initialization
-SSL info: SSLv3 read server hello A
-SSL info: SSLv3 read server certificate 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 write finished A
-SSL info: SSLv3 flush data
-SSL info: SSLv3 read server session ticket A
-SSL info: SSLv3 read finished A
-SSL info: SSL negotiation finished successfully
-SSL info: SSL negotiation finished successfully
-SSL connection using AES256-SHA
+SSL connection using ke-RSA-AES256-SHAnnn
 Succeeded in starting TLS
 >>> EHLO rhu.barb
 ??? 250-
-<<< 250-the.local.host.name Hello rhu.barb [127.0.0.1]
+<<< 250-testhost.test.ex Hello rhu.barb [127.0.0.1]
 ??? 250-SIZE
 <<< 250-SIZE 52428800
 ??? 250-8BITMIME
@@ -117,13 +91,7 @@ Succeeded in starting TLS
 <<< 250-CHUNKING
 ??? 250 HELP
 <<< 250 HELP
->>> MAIL FROM:<someone@some.domain>
->>> RCPT TO:<CALLER@the.local.host.name>
->>> BDAT 88 LAST
->>> To: Susan@random.com
->>> From: Sam@random.com
->>> Subject: This is a bodyless test message
->>> 
+>>> MAIL FROM:<someone@some.domain>\r\nRCPT TO:<CALLER@test.ex>\r\nBDAT 88 LAST\r\nTo: Susan@random.com\r\nFrom: Sam@random.com\r\nSubject: This is a bodyless test message\r\n
 ??? 250
 <<< 250 OK
 ??? 250
@@ -134,5 +102,5 @@ Succeeded in starting TLS
 <<< 250 OK id=10HmaY-0005vi-00
 >>> QUIT
 ??? 221
-<<< 221 the.local.host.name closing connection
+<<< 221 testhost.test.ex closing connection
 End of script