Merge from master into 4.next

[exim.git] / test / confs / 0242

diff --git a/test/confs/0242 b/test/confs/0242
index 3d4e6d825ab17827c70b8eb57a690fe058bed685..fc2dd70ba406afcfe153a654eb90b0af5a1039cc 100644 (file)
--- a/test/confs/0242
+++ b/test/confs/0242
@@ -1,13 +1,8 @@
 # Exim test configuration 0242
 
 # Exim test configuration 0242
 

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