Merge from master into 4.next

[exim.git] / test / confs / 4001

diff --git a/test/confs/4001 b/test/confs/4001
index 39e7705453ebbc2c4dcf3d121bb0eef050717b5e..85e68a587f52e97a9e63e4b5fb6a05d4afb79104 100644 (file)
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -1,15 +1,11 @@
 # Exim test configuration 4001
 # Content-scan: f-protd interface
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
-av_scanner = f-protd : localhost PORT_S
+av_scanner = f-protd : localhost4 PORT_S
 
 # ----- Main settings -----
 
@@ -19,8 +15,8 @@ acl_smtp_data = c_data
 begin acl
 
 c_data:
-  accept !malware = *
-  deny  logwrite = malware_name $malware_name
+  accept !malware = * OPT
+  deny  logwrite = $callout_address malware_name $malware_name
 
 # ----- Routers -----