Merge from master into 4.next

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

diff --git a/test/confs/0039 b/test/confs/0039
index f8ad999f57c83dd692a1bc65fdbe92dab8a88d80..8ca8b1eeca3f851a244025a045f64e3f7cb0721d 100644 (file)
--- a/test/confs/0039
+++ b/test/confs/0039
@@ -2,14 +2,9 @@
 
 QDG=
 
 
 QDG=
 

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