Merge from master into 4.next

[users/heiko/exim.git] / test / confs / 0614

diff --git a/test/confs/0614 b/test/confs/0614
index 2b236174779845745d674f68a1d791a70369dec8..d19be4e7452de7cf492177fab9139c7783e46e62 100644 (file)
--- a/test/confs/0614
+++ b/test/confs/0614
@@ -1,14 +1,9 @@
 # Exim test configuration 0614
 # hosts_connection_nolog versus sender_host lists caching
 
-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 -----