Testsuite: track newer GnuTLS behaviour

[exim.git] / test / confs / 4006

diff --git a/test/confs/4006 b/test/confs/4006
index 230f1159ef42567449ec2d91c015a5b9ecf736c2..4c7059fdf32f33dcd9cfa12ac34811640c4b1b8e 100644 (file)
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -1,15 +1,16 @@
-# Exim test configuration 4002
-# Content-scan: avast interface
+# Exim test configuration 4006
+# 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 = avast : DIR/eximdir/avast_sock : OPTION
+#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 -----