Merge from master into 4.next

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

diff --git a/test/confs/5005 b/test/confs/5005
index 6fa97f1529410010ee12ad2916a7796df6ff6404..d5d497a06f7a44d38f2a34657af2458667e45243 100644 (file)
--- a/test/confs/5005
+++ b/test/confs/5005
@@ -2,14 +2,9 @@
 
 QUOTA=500
 
 
 QUOTA=500
 

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