X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/a60f6c07eea74e79b88828295a191e79595d8960..863bd541063e72fcea7305b9d3ee2cb460a6d3d1:/test/confs/4005?ds=sidebyside

diff --git a/test/confs/4005 b/test/confs/4005
index 6d0b797b9..0ebb2be7b 100644
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -1,15 +1,16 @@
-# Exim test configuration 4002
+# Exim test configuration 4005
 # Content-scan: clamav interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+OPT=
+CONTROL=
+
+.include DIR/aux-var/std_conf_prefix
+
+log_selector = +subject
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
-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 -----
 
@@ -19,7 +20,7 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
-  accept !malware = *
+  accept !malware = * OPT
   deny	 logwrite = malware_name $malware_name
 
 # ----- Routers -----