Merge from master into 4.next

[exim.git] / test / confs / 0122

diff --git a/test/confs/0122 b/test/confs/0122
index 8ed176fe34d4d7f42f10913f678f16c0fdbeced3..3fec1235d4d552a79d9c6fe0c3b17f3549b445ed 100644 (file)
--- a/test/confs/0122
+++ b/test/confs/0122
@@ -1,12 +1,7 @@
 # Exim test configuration 0122
 
-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 -----