Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / scripts / 5410-cutthrough-OpenSSL / 5410

diff --git a/test/scripts/5410-cutthrough-OpenSSL/5410 b/test/scripts/5410-cutthrough-OpenSSL/5410
index d670abf4e6d2389923f64b379cd59ccf4a01faff..9f5ff7196aeb7c61bade5c1839dc7c5b75053835 100644 (file)
--- a/test/scripts/5410-cutthrough-OpenSSL/5410
+++ b/test/scripts/5410-cutthrough-OpenSSL/5410
@@ -1,19 +1,32 @@
 # cutthrough_delivery to target oferring TLS
 exim -DSERVER=server -bd -oX PORT_D
 ****
+# this one should succeed
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<userx@domain.com>
 DATA
 
 .
 QUIT
 ****
-# via a transport setting never-tls
+# via a transport setting hosts_avoid_tls
+# so this one should not use TLS
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<usery@domain.com>
+DATA
+
+.
+QUIT
+****
+# via a transport setting hosts_verify_avoid_tls
+# so this one should not use TLS
+exim -d-all+acl+transport+expand+lists -bs
+EHLO myhost.test.ex
+MAIL FROM:<CALLER@myhost.test.ex>
 RCPT TO:<usery@domain.com>
 DATA