Merge from master into 4.next

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

diff --git a/test/confs/4005 b/test/confs/4005
index cd715d5e630fe54053481707115cc02edbc5a3e1..0ebb2be7b63cddfffebbcd7d5b751d43917a87c0 100644 (file)
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -4,15 +4,10 @@
 OPT=
 CONTROL=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-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 =
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
+primary_hostname = myhost.test.ex
 
 #XXX we need an additional test for tcp-connected clamd
 av_scanner = clamd : DIR/eximdir/clam_sock CONTROL