Taint: fix ACL "spam" condition, to permit tainted name arguments

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

diff --git a/test/confs/4009 b/test/confs/4009
index 98f696f44d6605f2f119aed091f9fa598ad6c62d..f8e832070ea5a5ccbf3522aba9b3420cc6c77962 100644 (file)
--- a/test/confs/4009
+++ b/test/confs/4009
@@ -1,14 +1,12 @@
 # Exim test configuration 4009
 # Exim test configuration 4009

-# Content-scan: spamassassin interface
-
-OPT= 127.0.0.1 7833
+# Content-scan: sophie interface

 
 .include DIR/aux-var/std_conf_prefix
 
 log_selector = +subject
 primary_hostname = myhost.test.ex
 
 
 .include DIR/aux-var/std_conf_prefix
 
 log_selector = +subject
 primary_hostname = myhost.test.ex
 

-spamd_address = OPT
+av_scanner = sophie : DIR/eximdir/sophie_sock

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -18,11 +16,8 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
 begin acl
 
 c_data:

-  warn
-    spam = nobody
-  warn
-    log_message = $callout_address $spam_action $spam_report
-  accept
+  accept !malware = * OPT
+  deny  logwrite = malware_name $malware_name

 
 # ----- Routers -----
 
 
 # ----- Routers -----