Merge branch 'master' into 4.next

[exim.git] / test / confs / 4002

diff --git a/test/confs/4002 b/test/confs/4002
index 5ebb937a64ce187597339f3830bfaa2b80d836b7..dde49c3b2fff876e5602e48120a85e26502afbfd 100644 (file)
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -1,13 +1,10 @@
 # Exim test configuration 4002
 # Content-scan: aveserver interface
 
 # Exim test configuration 4002
 # Content-scan: aveserver 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 = aveserver : DIR/eximdir/aveserver_sock
 
 
 av_scanner = aveserver : DIR/eximdir/aveserver_sock
 


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

-  accept !malware = *
+  accept !malware = * OPT

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