Merge branch 'master' into 4.next

[exim.git] / test / confs / 4005

diff --git a/test/confs/4005 b/test/confs/4005
index 8ed28d4a62111f4bec52f181f99f3078fce19200..0ebb2be7b63cddfffebbcd7d5b751d43917a87c0 100644 (file)
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -1,16 +1,16 @@
 # Exim test configuration 4005
 # Content-scan: clamav interface
 
 # Exim test configuration 4005
 # Content-scan: clamav 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
+OPT=
+CONTROL=
+
+.include DIR/aux-var/std_conf_prefix
+

 log_selector = +subject
 log_selector = +subject

+primary_hostname = myhost.test.ex

 
 

-av_scanner = clamd : DIR/eximdir/clam_sock
+#XXX we need an additional test for tcp-connected clamd
+av_scanner = clamd : DIR/eximdir/clam_sock CONTROL

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----