Testsuite: more connect-time munge tweaking

[exim.git] / test / confs / 4002

diff --git a/test/confs/4002 b/test/confs/4002
index cf124eccf81cd1497464be36b3088b491e8f42a7..4578cc01909510b7eb8d000fe1d8660db7c121b9 100644 (file)
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -10,6 +10,7 @@ rfc1413_query_timeout = 0s
 
 acl_smtp_rcpt = check_rcpt
 acl_smtp_data = check_data
+acl_smtp_mime = check_mime
 acl_not_smtp  = check_data
 
 
@@ -20,6 +21,15 @@ begin acl
 check_rcpt:
   accept
 
+check_mime:
+    warn condition = ${if match{$mime_content_type}{text}}
+         mime_regex = \N(?s)([\w.+=-]+@\w[\w-]*\.[\w.-]+\w)\
+                        (.+?([\w.+=-]+@\w[\w-]*\.[\w.-]+\w))?\
+                        (.+?([\w.+=-]+@\w[\w-]*\.[\w.-]+\w))?\
+                        (.+?([\w.+=-]+@\w[\w-]*\.[\w.-]+\w))?\
+                        (.+?([\w.+=-]+@\w[\w-]*\.[\w.-]+\w))?\N
+    accept
+
 check_data:
   warn     regex   = \N(THIS\s((\w+)\s)?REGEX)\N
            message = X-Regex: Regex matched <$regex1> <$regex3>
@@ -46,7 +56,8 @@ begin transports
 
 t1:
   driver = appendfile
-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER