X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=test%2Fscripts%2F5400-cutthrough%2F5402;h=1113c6d32836d8980426ecccb5a40c23016eb31e;hb=456d70ec89d9ba122871f1f035bb308f4771016f;hp=d670abf4e6d2389923f64b379cd59ccf4a01faff;hpb=4ed8d31a9ccdfc4a948703fd8ac3f7cb6b8fdf8e;p=user%2Fhenk%2Fcode%2Fexim.git

diff --git a/test/scripts/5400-cutthrough/5402 b/test/scripts/5400-cutthrough/5402
index d670abf4e..1113c6d32 100644
--- a/test/scripts/5400-cutthrough/5402
+++ b/test/scripts/5400-cutthrough/5402
@@ -1,24 +1,49 @@
-# cutthrough_delivery to target oferring TLS
-exim -DSERVER=server -bd -oX PORT_D
+# cutthrough_delivery vs. recipient-verify cache entry
+need_ipv4
+#
+# Set up callout cache
+#
+server PORT_S
+220 ESMTP
+EHLO
+250 OK
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Recipient OK
+QUIT
+250 OK
 ****
-exim -d-all+acl+transport+expand+lists -bs
+exim -bs -odf
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
-RCPT TO:<userx@domain.com>
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<dest@domain.com>
+QUIT
+****
+#
+# Send message with cutthrough
+#
+server PORT_S
+220 ESMTP
+EHLO
+250 OK
+MAIL FROM:
+250 Sender OK
+RCPT TO:
+250 Recipient OK
 DATA
-
+354 Send data
 .
+250 OK
 QUIT
+250 OK
 ****
-# via a transport setting never-tls
-exim -d-all+acl+transport+expand+lists -bs
+exim -DOPT=CUTTHROUGH -bs -odf
 EHLO myhost.test.ex
-MAIL FROM:<eximtest@myhost.test.ex>
-RCPT TO:<usery@domain.com>
+MAIL FROM:<CALLER@myhost.test.ex>
+RCPT TO:<dest@domain.com>
 DATA
 
 .
 QUIT
 ****
-killdaemon
-no_msglog_check