Fix ${readsocket } eol-replacement. Bug 2630

[exim.git] / test / confs / 4001

diff --git a/test/confs/4001 b/test/confs/4001
index cf124eccf81cd1497464be36b3088b491e8f42a7..856beb1ca5cfe45a2230039b869883bec8a13b53 100644 (file)
--- a/test/confs/4001
+++ b/test/confs/4001
@@ -1,53 +1,25 @@
-# Exim test configuration 4001:  ACL regex=
+# Exim test configuration 4001: multiple messages in connection

 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s
-
+queue_only

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

-acl_smtp_rcpt = check_rcpt
-acl_smtp_data = check_data
-acl_not_smtp  = check_data
-
+acl_smtp_rcpt = accept
+acl_smtp_mime = check_mime
+acl_smtp_data =        check_data

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

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

 
 check_data:
 
 check_data:

-  warn     regex   = \N(THIS\s((\w+)\s)?REGEX)\N
-           message = X-Regex: Regex matched <$regex1> <$regex3>
-
-  warn     condition = ${if !eq{$h_fakereject:}{}}
-           control   = fakereject
-
-  warn     condition = ${if !eq{$h_fakedefer:}{}}
-           control   = fakedefer
-
-  accept
-
-# ----- Routers -----
-
-begin routers
-
-r1:
-  driver = accept
-  transport = t1
-
-# ----- Transports -----
-
-begin transports
-
-t1:
-  driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
-  user = CALLER
-
+  accept       logwrite = mime_acl: mime_part_count $mime_part_count

 
 # End
 
 # End