Fix $mime_part_count for non-mime message on multi-message connection. Bug 2537

[exim.git] / test / confs / 4001

diff --git a/test/confs/4001 b/test/confs/4001
index 85e68a587f52e97a9e63e4b5fb6a05d4afb79104..856beb1ca5cfe45a2230039b869883bec8a13b53 100644 (file)
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -1,29 +1,25 @@
-# Exim test configuration 4001
-# Content-scan: f-protd interface
+# Exim test configuration 4001: multiple messages in connection
 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
-
-av_scanner = f-protd : localhost4 PORT_S
+queue_only
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
-acl_smtp_data = c_data
-
-begin acl
+acl_smtp_mime = check_mime
+acl_smtp_data =        check_data
 
-c_data:
-  accept !malware = * OPT
-  deny  logwrite = $callout_address malware_name $malware_name
+# ----- ACL -----
 
-# ----- 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