Merge branch 'master' into 4.next

[exim.git] / test / confs / 0311

diff --git a/test/confs/0311 b/test/confs/0311
index 34a99b6c5a7fbe0f968a507b37daff2992f51a1d..99082cb7f75b079b79f9a68b4a9bde62bafb51e8 100644 (file)
--- a/test/confs/0311
+++ b/test/confs/0311
@@ -1,13 +1,8 @@
 # Exim test configuration 0311
 
 # Exim test configuration 0311
 

-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 -----