From 4fab92fbc2b63bac2d89c1dae69fa1845cb640b7 Mon Sep 17 00:00:00 2001
From: "Heiko Schlittermann (HS12-RIPE)" <hs@schlittermann.de>
Date: Fri, 25 Nov 2016 11:23:26 +0100
Subject: Merge from master into 4.next

Done with git merge --squash -x theirs master
---
 test/confs/4006 | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

(limited to 'test/confs/4006')

diff --git a/test/confs/4006 b/test/confs/4006
index c3d2a3142..3efca602c 100644
--- 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
 
-- 
cgit v1.2.3