Merge from master into 4.next

[exim.git] / test / confs / 0540

diff --git a/test/confs/0540 b/test/confs/0540
index 641335f6bccb057786ad1e015095dce55ac94afa..7ebbdd2b4340437f4c246c09ba5951764883f3be 100644 (file)
--- a/test/confs/0540
+++ b/test/confs/0540
@@ -1,13 +1,8 @@
 # Exim test configuration 0540
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----