Merge from master into 4.next

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

diff --git a/test/confs/0549 b/test/confs/0549
index 29df1260c0cb7121d695e97f8b8b83ba96993591..f3da5f486b83836cfa014b30a191560162ed204b 100644 (file)
--- a/test/confs/0549
+++ b/test/confs/0549
@@ -1,12 +1,8 @@
 # Exim test configuration 0549
 
 # Exim test configuration 0549
 

-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

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