Sync 4.next from master

[users/heiko/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 c43e1865be0fc58d1b9906f5257429252c81edce..001e7ae67d183c8dd865a5300a12b961412b09ab 100644 (file)
--- a/test/scripts/5420-cutthrough-GnuTLS/5420
+++ b/test/scripts/5420-cutthrough-GnuTLS/5420
@@ -1,9 +1,12 @@
 # cutthrough_delivery to target offering 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
 
 RCPT TO:<userx@domain.com>
 DATA
 


@@ -13,7 +16,7 @@ QUIT
 # via a transport setting hosts_avoid_tls
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
 # via a transport setting hosts_avoid_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
 
 RCPT TO:<usery@domain.com>
 DATA
 


@@ -23,7 +26,7 @@ QUIT
 # via a transport setting hosts_verify_avoid_tls
 exim -d-all+acl+transport+expand+lists -bs
 EHLO myhost.test.ex
 # via a transport setting hosts_verify_avoid_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
 
 RCPT TO:<usery@domain.com>
 DATA