Testsuite: SPF testcase additions

[exim.git] / test / confs / 4008

diff --git a/test/confs/4008 b/test/confs/4008
index a3bb87f73172a5eeeb8194cadb7d874878253f71..e10c2c024204b78c9f09c08c15cf90c605c4f17c 100644 (file)
--- a/test/confs/4008
+++ b/test/confs/4008
@@ -1,12 +1,12 @@
 # Exim test configuration 4008
 # Exim test configuration 4008

-# Content-scan: rspamd interface
+# Content-scan: cmdline 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 = 127.0.0.1 11333 variant=rspamd
+av_scanner = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)

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


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

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

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