Merge from master into 4.next

[exim.git] / test / confs / 0524

diff --git a/test/confs/0524 b/test/confs/0524
index 0e6550cf62475b2788f6b37fb1ee08672864a6ce..a94122c388026c1c6453492ff3da1fba1263ba97 100644 (file)
--- a/test/confs/0524
+++ b/test/confs/0524
@@ -1,13 +1,8 @@
 # Exim test configuration 0524
 
-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 -----