Merge from master into 4.next

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

diff --git a/test/confs/4006 b/test/confs/4006
index c3d2a31422438a957220d2b0d52db3fcce34edc1..3efca602c681f7e89662ae2efed74b8bb863727c 100644 (file)
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -1,15 +1,10 @@
 # Exim test configuration 4006
 # Content-scan: avast interface
 
-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
+.include DIR/aux-var/std_conf_prefix
+
 log_selector = +subject
-tls_advertise_hosts =
+primary_hostname = myhost.test.ex
 
 av_scanner = avast : DIR/eximdir/avast_sock : OPTION