Merge branch 'master' into 4.next

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

diff --git a/test/confs/0085 b/test/confs/0085
index efd52533c25a2ffabd9c4bd282a1b3146456fe68..25eea9e903f0bb65b8fb094448f1f7fc2f2c1b05 100644 (file)
--- a/test/confs/0085
+++ b/test/confs/0085
@@ -1,13 +1,8 @@
 # Exim test configuration 0085
 
 # Exim test configuration 0085
 

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