Merge branch 'master' into 4.next

[users/jgh/exim.git] / test / confs / 0460

diff --git a/test/confs/0460 b/test/confs/0460
index 505139b3c1c067149cdc6db0b21e7c8f801581b0..52628ab25aa7f36af93e1e13e68c19ec7eaff9ac 100644 (file)
--- a/test/confs/0460
+++ b/test/confs/0460
@@ -1,12 +1,8 @@
 # Exim test configuration 0460
 
 # Exim test configuration 0460
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----