ARC: harden versus badly-formatted AMS line

[users/jgh/exim.git] / test / confs / 4006

diff --git a/test/confs/4006 b/test/confs/4006
index a0b74f1c19a176daf7bb9b25a2260f095217a3ab..4c7059fdf32f33dcd9cfa12ac34811640c4b1b8e 100644 (file)
--- a/test/confs/4006
+++ b/test/confs/4006
@@ -1,18 +1,16 @@
 # Exim test configuration 4006
 # Exim test configuration 4006

-# Content-scan: avast interface
+# Content-scan: clamav interface
+
+OPT=
+CONTROL=
+
+.include DIR/aux-var/std_conf_prefix

 
 

-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

 log_selector = +subject
 log_selector = +subject

-tls_advertise_hosts =
+primary_hostname = myhost.test.ex

 
 

-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 -----
 


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

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

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