testsuite: tidy logs/4520 and confs/4520

[exim.git] / test / confs / 4001

diff --git a/test/confs/4001 b/test/confs/4001
index 00406b4ee3598eff740a8c75432093325f404fb7..856beb1ca5cfe45a2230039b869883bec8a13b53 100644 (file)
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -1,33 +1,25 @@
-# Exim test configuration 4001
-# Content-scan: f-protd interface
+# Exim test configuration 4001: multiple messages in connection

 
 

-exim_path = EXIM_PATH
-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
+.include DIR/aux-var/std_conf_prefix

 
 

-av_scanner = f-protd : localhost PORT_S
+primary_hostname = myhost.test.ex
+queue_only

 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept

-acl_smtp_data = c_data
+acl_smtp_mime = check_mime
+acl_smtp_data =        check_data

 
 

-begin acl
+# ----- ACL -----

 
 

-c_data:
-  accept !malware = * OPT
-  deny  logwrite = malware_name $malware_name
-
-# ----- Routers -----
+begin acl

 
 

-begin routers
+check_mime:
+  accept       decode  = default
+               logwrite = mime_acl: mime_part_count $mime_part_count

 
 

-r:
-  driver = redirect
-  data = :blackhole:
+check_data:
+  accept       logwrite = mime_acl: mime_part_count $mime_part_count

 
 # End
 
 # End