12 files changed, 78 insertions, 78 deletions
diff --git a/test/confs/5800 b/test/confs/5800
index f1bd09d1c..bd0b77df2 100644
--- a/test/confs/5800
+++ b/test/confs/5800
@@ -1,74 +1,10 @@
-# Exim test configuration 5800
-# DANE
-
-SERVER=
+# Exim test configuration 5890
+# DANE common
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
-acl_smtp_rcpt = accept
-
-log_selector =  +tls_peerdn
-
-queue_only
-queue_run_in_order
-
-tls_advertise_hosts = *
-# needed to force generation
-tls_dhparam = historic
-
-# Set certificate only if server
-
-tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
-
-#tls_verify_hosts = *
-#tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
-
-
-# ----- Routers -----
-
-begin routers
-
-client:
-  driver = accept
-  condition = ${if eq {SERVER}{server}{no}{yes}}
-  retry_use_local_part
-  transport = send_to_server
-
-server:
-  driver = redirect
-  data = :blackhole:
-
-
-# ----- Transports -----
-
-begin transports
-
-send_to_server:
-  driver = smtp
-  allow_localhost
-  hosts = 127.0.0.1
-  port = PORT_D
-#  tls_certificate = DIR/aux-fixed/cert2
-#  tls_privatekey = DIR/aux-fixed/cert2
-#  tls_verify_certificates = DIR/aux-fixed/cert2
-
-
-# ----- Retry -----
-
-
-begin retry
-
-* * F,5d,10s
-
-
-# End
diff --git a/test/confs/5820 b/test/confs/5820
new file mode 100644
index 000000000..f1bd09d1c
--- /dev/null
+++ b/test/confs/5820
@@ -0,0 +1,74 @@
+# Exim test configuration 5800
+# DANE
+
+SERVER=
+
+exim_path = EXIM_PATH
+host_lookup_order = bydns
+primary_hostname = myhost.test.ex
+rfc1413_query_timeout = 0s
+spool_directory = DIR/spool
+log_file_path = DIR/spool/log/SERVER%slog
+gecos_pattern = ""
+gecos_name = CALLER_NAME
+
+# ----- Main settings -----
+
+acl_smtp_rcpt = accept
+
+log_selector =  +tls_peerdn
+
+queue_only
+queue_run_in_order
+
+tls_advertise_hosts = *
+# needed to force generation
+tls_dhparam = historic
+
+# Set certificate only if server
+
+tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+tls_privatekey = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
+
+#tls_verify_hosts = *
+#tls_verify_certificates = ${if eq {SERVER}{server}{DIR/aux-fixed/cert2}fail}
+
+
+# ----- Routers -----
+
+begin routers
+
+client:
+  driver = accept
+  condition = ${if eq {SERVER}{server}{no}{yes}}
+  retry_use_local_part
+  transport = send_to_server
+
+server:
+  driver = redirect
+  data = :blackhole:
+
+
+# ----- Transports -----
+
+begin transports
+
+send_to_server:
+  driver = smtp
+  allow_localhost
+  hosts = 127.0.0.1
+  port = PORT_D
+#  tls_certificate = DIR/aux-fixed/cert2
+#  tls_privatekey = DIR/aux-fixed/cert2
+#  tls_verify_certificates = DIR/aux-fixed/cert2
+
+
+# ----- Retry -----
+
+
+begin retry
+
+* * F,5d,10s
+
+
+# End
diff --git a/test/confs/5850 b/test/confs/5840
index c381ef616..c381ef616 100644
--- a/test/confs/5850
+++ b/test/confs/5840
diff --git a/test/confs/5890 b/test/confs/5890
deleted file mode 100644
index bd0b77df2..000000000
--- a/test/confs/5890
+++ /dev/null
@@ -1,10 +0,0 @@
-# Exim test configuration 5890
-# DANE common
-
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-
-# ----- Main settings -----
-
diff --git a/test/log/5850 b/test/log/5840
index 62dc13f02..62dc13f02 100644
--- a/test/log/5850
+++ b/test/log/5840
diff --git a/test/scripts/5890-DANE/5890 b/test/scripts/5800-DANE/5800
index fd7b6d6d3..98a70c115 100644
--- a/test/scripts/5890-DANE/5890
+++ b/test/scripts/5800-DANE/5800
@@ -6,7 +6,7 @@
 
 exim -be
 
-dnslookup tpda: ${lookup dnsdb {tlsa=_1225._tcp.dane512ee.test.ex} \
+dnslookup tlsa: ${lookup dnsdb {tlsa=_1225._tcp.dane512ee.test.ex} \
                         {$value}{none}}
 
 ****
diff --git a/test/scripts/5890-DANE/REQUIRES b/test/scripts/5800-DANE/REQUIRES
index 2314a3236..2314a3236 100644
--- a/test/scripts/5890-DANE/REQUIRES
+++ b/test/scripts/5800-DANE/REQUIRES
diff --git a/test/scripts/5800-DANE-GnuTLS/5800 b/test/scripts/5820-DANE-GnuTLS/5820
index 07ad7406d..07ad7406d 100644
--- a/test/scripts/5800-DANE-GnuTLS/5800
+++ b/test/scripts/5820-DANE-GnuTLS/5820
diff --git a/test/scripts/5800-DANE-GnuTLS/REQUIRES b/test/scripts/5820-DANE-GnuTLS/REQUIRES
index 4234c92f8..4234c92f8 100644
--- a/test/scripts/5800-DANE-GnuTLS/REQUIRES
+++ b/test/scripts/5820-DANE-GnuTLS/REQUIRES
diff --git a/test/scripts/5850-DANE-OpenSSL/5850 b/test/scripts/5840-DANE-OpenSSL/5840
index 814b4b0e8..814b4b0e8 100644
--- a/test/scripts/5850-DANE-OpenSSL/5850
+++ b/test/scripts/5840-DANE-OpenSSL/5840
diff --git a/test/scripts/5850-DANE-OpenSSL/REQUIRES b/test/scripts/5840-DANE-OpenSSL/REQUIRES
index 59cb7dc91..59cb7dc91 100644
--- a/test/scripts/5850-DANE-OpenSSL/REQUIRES
+++ b/test/scripts/5840-DANE-OpenSSL/REQUIRES
diff --git a/test/stdout/5890 b/test/stdout/5800
index 815d95942..bcbbd88e0 100644
--- a/test/stdout/5890
+++ b/test/stdout/5800
@@ -1,4 +1,4 @@
 > 
-> dnslookup tpda: 3 1 2 3d5eb81b1dfc3f93c1fa8819e3fb3fdb41bb590441d5f3811db17772f4bc6de29bdd7c4f4b723750dda871b99379192b3f979f03db1252c4f08b03ef7176528d000000
+> dnslookup tlsa: 3 1 2 3d5eb81b1dfc3f93c1fa8819e3fb3fdb41bb590441d5f3811db17772f4bc6de29bdd7c4f4b723750dda871b99379192b3f979f03db1252c4f08b03ef7176528d000000
 > 
 >