Add os_unsetenv()

[users/jgh/exim.git] / test / scripts / 5400-cutthrough / 5402

diff --git a/test/scripts/5400-cutthrough/5402 b/test/scripts/5400-cutthrough/5402
index d670abf4e6d2389923f64b379cd59ccf4a01faff..3e6f3189ee6594958f00716d2e1d1296878a8a6e 100644 (file)
--- a/test/scripts/5400-cutthrough/5402
+++ b/test/scripts/5400-cutthrough/5402
@@ -1,24 +1,42 @@
-# cutthrough_delivery to target oferring TLS
-exim -DSERVER=server -bd -oX PORT_D
+# cutthrough_delivery and -bhc
+need_ipv4
+munge loopback
+no_msglog_check
+#
+# Despite config for cutthrough should not make onward conn
+server -t -2 PORT_S

 ****
 ****

-exim -d-all+acl+transport+expand+lists -bs
+exim -bhc 1.2.3.4

 EHLO myhost.test.ex
 EHLO myhost.test.ex

-MAIL FROM:<eximtest@myhost.test.ex>
-RCPT TO:<userx@domain.com>
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<plain@domain.com>

 DATA
 
 .
 QUIT
 ****
 DATA
 
 .
 QUIT
 ****

-# via a transport setting never-tls
-exim -d-all+acl+transport+expand+lists -bs
+#
+# Onward conn made for r-verify but cleared before DATA
+server PORT_S
+220 server ready
+EHLO
+250 OK
+MAIL
+250 OK
+RCPT
+250 OK
+QUIT
+220 OK
+*eof
+****
+exim -bhc 1.2.3.4

 EHLO myhost.test.ex
 EHLO myhost.test.ex

-MAIL FROM:<eximtest@myhost.test.ex>
-RCPT TO:<usery@domain.com>
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<verify@domain.com>

 DATA
 
 .
 QUIT
 ****
 DATA
 
 .
 QUIT
 ****

-killdaemon
-no_msglog_check
+#
+# End