Merge branch 'master' into 4.next

[exim.git] / test / confs / 5800

diff --git a/test/confs/5800 b/test/confs/5800
index af03ee53a8f8dc04bb634d35c4f249a4685a137d..aa75b21a11b97f619f9dedcef496cdf11a131c7b 100644 (file)
--- a/test/confs/5800
+++ b/test/confs/5800
@@ -1,12 +1,9 @@
 # Exim test configuration 5800
 # DANE common
 
-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-tls_advertise_hosts =
 
 # ----- Main settings -----