Merge from master into 4.next

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

diff --git a/test/confs/0422 b/test/confs/0422
index 5ad06071e3415fe4e8daa47684eb0c6cd110d77c..14255d621293b84b0f80cda01e39d141e31e6fd7 100644 (file)
--- a/test/confs/0422
+++ b/test/confs/0422
@@ -1,12 +1,7 @@
 # Exim test configuration 0422
 
 # Exim test configuration 0422
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
+.include DIR/aux-var/std_conf_prefix
+

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