shift queue name use up to top layer in spooldir hierachy

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

diff --git a/test/confs/4005 b/test/confs/4005
index 6d0b797b913afd01d9e811a7a3b60cba7a2b5cc6..e7da5a56db6be83f8d1ca453a4c44239ae7750f2 100644 (file)
--- a/test/confs/4005
+++ b/test/confs/4005
@@ -1,15 +1,22 @@
-# Exim test configuration 4002
+# Exim test configuration 4005
 # Content-scan: clamav interface
 
+OPT=
+CONTROL=
+
 exim_path = EXIM_PATH
+keep_environment =
 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
+tls_advertise_hosts =
+log_selector = +subject
 
-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 +26,7 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
-  accept !malware = *
+  accept !malware = * OPT
   deny  logwrite = malware_name $malware_name
 
 # ----- Routers -----