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 814b4b0e8c780c1d3598fb6f2d4f6bb400f00f66..143bf615b400a7b3593cda09801686745a4c0f39 100644 (file)
--- a/test/scripts/5840-DANE-OpenSSL/5840
+++ b/test/scripts/5840-DANE-OpenSSL/5840
@@ -3,28 +3,73 @@
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****
 # TLSA (3 1 1)
 exim -DSERVER=server -DDETAILS=ee -bd -oX PORT_D
 ****
 # TLSA (3 1 1)

-exim CALLER@dane256ee.test.ex
+exim -odq CALLER@dane256ee.test.ex

 Testing
 ****
 # TLSA (3 1 2)
 Testing
 ****
 # TLSA (3 1 2)

-exim CALLER@mxdane512ee.test.ex
+exim -odq CALLER@mxdane512ee.test.ex

 Testing
 ****
 exim -qf
 ****
 Testing
 ****
 exim -qf
 ****

-killdaemon
-exim -DSERVER=server -DDETAILS=ee -DNOTDAEMON -qf
+#
+#
+# Recipient callout
+exim -DOPT=callout -bhc 127.0.0.1
+MAIL FROM: <CALLER@myhost.test.ex>
+RCPT TO: <CALLER@dane256ee.test.ex>

 ****
 ****

+killdaemon

 #
 #
 exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D
 ****
 # TLSA (2 0 1)
 #
 #
 exim -DSERVER=server -DDETAILS=ta -bd -oX PORT_D
 ****
 # TLSA (2 0 1)

-exim CALLER@mxdane256ta.test.ex
+exim -odq CALLER@mxdane256ta.test.ex

 Testing
 ****
 exim -qf
 ****
 killdaemon
 Testing
 ****
 exim -qf
 ****
 killdaemon

-exim -DSERVER=server -DDETAILS=ta -DNOTDAEMON -qf
+#
+# A server with a nonverifying cert and no TLSA
+# Check we get a non-CV but TLS connection, with try_dane but no require_dane
+exim -DSERVER=server -DDETAILS=no -bd -oX PORT_D
+****
+exim -odq CALLER@thishost.test.ex
+Testing
+****
+exim -qf
+****
+killdaemon
+#
+# A server with a verifying cert and no TLSA
+# Check we get a CV and TLS connection, with try_dane but no require_dane
+exim -DSERVER=server -DDETAILS=ca -bd -oX PORT_D
+****
+exim -odq CALLER@thishost.test.ex
+Testing
+****
+exim -DOPT=no_certname -qf

 ****
 ****

+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