Merge from master into 4.next

[users/heiko/exim.git] / test / confs / 4007

diff --git a/test/confs/4007 b/test/confs/4007
index 576c0087fe8c38df39c68dccf454bcccd5370f61..55bfcfafb8249a2afcbfc6814573b9e8e28ac33b 100644 (file)
--- a/test/confs/4007
+++ b/test/confs/4007
@@ -1,13 +1,10 @@
 # Exim test configuration 4007
 # Content-scan: cmsline interface
 
 # Exim test configuration 4007
 # Content-scan: cmsline 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 = cmdline : DIR/aux-fixed/TESTNUM.script -o OPT %s : found in file : ^(\S*)
 


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