Testsuite: fix 0173 + 2100+, take 2

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

diff --git a/test/confs/4005 b/test/confs/4005
index 6d0b797b913afd01d9e811a7a3b60cba7a2b5cc6..0ebb2be7b63cddfffebbcd7d5b751d43917a87c0 100644 (file)
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -1,15 +1,16 @@
-# Exim test configuration 4002
+# Exim test configuration 4005

 # Content-scan: clamav interface
 
 # 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
 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 -----
 
 
 # ----- Main settings -----
 


@@ -19,7 +20,7 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
 begin acl
 
 c_data:

-  accept !malware = *
+  accept !malware = * OPT

   deny  logwrite = malware_name $malware_name
 
 # ----- Routers -----
   deny  logwrite = malware_name $malware_name
 
 # ----- Routers -----