Testsuite: track newer GnuTLS behaviour

[exim.git] / test / confs / 4008

diff --git a/test/confs/4008 b/test/confs/4008
index 7cba2689f2fbc2e72c05477dcc0564b2f039dde3..1ec1b85fe98ba6498579124666ebb072683fbd7b 100644 (file)
--- a/test/confs/4008
+++ b/test/confs/4008
@@ -1,18 +1,12 @@
 # Exim test configuration 4008
 # Exim test configuration 4008

-# Content-scan: rspamd interface
+# Content-scan: cmsline interface
+
+.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
-tls_advertise_hosts =

 log_selector = +subject
 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 -----
 


@@ -22,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 -----