Merge from master into 4.next

[exim.git] / test / confs / 0485

diff --git a/test/confs/0485 b/test/confs/0485
index 4b8a0dbb32d9d479d52a63d68d24e15d862976dc..ad31830e0a3e02e47b184d282b35673746c4e84c 100644 (file)
--- a/test/confs/0485
+++ b/test/confs/0485
@@ -1,13 +1,8 @@
 # Exim test configuration 0485
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----