Testsuite: revert some of the modernish Perl constructs

[exim.git] / test / scripts / 5840-DANE-OpenSSL / 5840

diff --git a/test/scripts/5840-DANE-OpenSSL/5840 b/test/scripts/5840-DANE-OpenSSL/5840
index eef14c2fe6637cdf211cd15968532bc26978dfad..143bf615b400a7b3593cda09801686745a4c0f39 100644 (file)
--- a/test/scripts/5840-DANE-OpenSSL/5840
+++ b/test/scripts/5840-DANE-OpenSSL/5840
@@ -12,6 +12,13 @@ Testing
 ****
 exim -qf
 ****
 ****
 exim -qf
 ****

+#
+#
+# Recipient callout
+exim -DOPT=callout -bhc 127.0.0.1
+MAIL FROM: <CALLER@myhost.test.ex>
+RCPT TO: <CALLER@dane256ee.test.ex>
+****

 killdaemon
 #
 #
 killdaemon
 #
 #


@@ -43,7 +50,26 @@ exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
 exim -odq CALLER@thishost.test.ex
 Testing
 ****
 exim -odq CALLER@thishost.test.ex
 Testing
 ****

-exim -qf
+exim -DOPT=no_certname -qf

 ****
 killdaemon
 #
 ****
 killdaemon
 #

+#
+exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
+****
+# A server with two MXs for which both TLSA lookups return defer
+exim -odq CALLER@mxdanelazy.test.ex
+Testing
+****
+# A server lacking a TLSA, required
+exim -odq CALLER@dane.no.1.test.ex
+Testing
+****
+# A server lacking a TLSA, requested only
+exim -odq CALLER@dane.no.2.test.ex
+Testing
+****
+exim -qf
+****
+killdaemon
+no_msglog_check