Merge from master into 4.next

[exim.git] / test / confs / 0262

diff --git a/test/confs/0262 b/test/confs/0262
index b884f80d41bdf678facbb66d3e25d1931dda23de..dc6a1d4af53f1a361300343d614535416536205f 100644 (file)
--- a/test/confs/0262
+++ b/test/confs/0262
@@ -1,13 +1,8 @@
 # Exim test configuration 0262
 
 # Exim test configuration 0262
 

-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

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

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