Sync 4.next from master

[exim.git] / test / scripts / 5420-cutthrough-GnuTLS / 5420

diff --git a/test/scripts/5420-cutthrough-GnuTLS/5420 b/test/scripts/5420-cutthrough-GnuTLS/5420
index d670abf4e6d2389923f64b379cd59ccf4a01faff..001e7ae67d183c8dd865a5300a12b961412b09ab 100644 (file)
--- a/test/scripts/5420-cutthrough-GnuTLS/5420
+++ b/test/scripts/5420-cutthrough-GnuTLS/5420
@@ -1,19 +1,32 @@
-# cutthrough_delivery to target oferring TLS
+# cutthrough_delivery to target offering TLS
+#
+munge optional_ocsp
+#

 exim -DSERVER=server -bd -oX PORT_D
 ****
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
 exim -DSERVER=server -bd -oX PORT_D
 ****
 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
 ****
 RCPT TO:<userx@domain.com>
 DATA
 
 .
 QUIT
 ****

-# via a transport setting never-tls
+# via a transport setting hosts_avoid_tls

 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
 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
+exim -d-all+acl+transport+expand+lists -bs
+EHLO myhost.test.ex
+MAIL FROM:<CALLER@myhost.test.ex>

 RCPT TO:<usery@domain.com>
 DATA
 
 RCPT TO:<usery@domain.com>
 DATA