testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 4007

diff --git a/test/confs/4007 b/test/confs/4007
index 576c0087fe8c38df39c68dccf454bcccd5370f61..0b082b6843eccb9d2a2d10aa97c6e1b1e78396c2 100644 (file)
--- a/test/confs/4007
+++ b/test/confs/4007
@@ -1,15 +1,12 @@
 # Exim test configuration 4007
 # Exim test configuration 4007

-# Content-scan: cmsline interface
+# Content-scan: avast interface

 
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.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 = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)
+av_scanner = avast : DIR/eximdir/avast_sock : OPTION

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


@@ -19,7 +16,7 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
 begin acl
 
 c_data:

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

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