Merge from master into 4.next

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

diff --git a/test/confs/0309 b/test/confs/0309
index 2f7ccf0c3d73b62e6873942817a4d40e06c30a53..4d644900993e44fc111d61b2735662146dc23fff 100644 (file)
--- a/test/confs/0309
+++ b/test/confs/0309
@@ -1,13 +1,8 @@
 # Exim test configuration 0309
 
 # Exim test configuration 0309
 

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

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