Merge from master into 4.next

[exim.git] / test / confs / 3412

diff --git a/test/confs/3412 b/test/confs/3412
index 1bdb9d8e25fcf5427d59d3efe85b189d532ce146..c0a1c5509913ca080aa381e57b1bc8bb7f0b46e0 100644 (file)
--- a/test/confs/3412
+++ b/test/confs/3412
@@ -1,13 +1,8 @@
 # Exim test configuration 3412
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----