Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / confs / 4002

diff --git a/test/confs/4002 b/test/confs/4002
index dde49c3b2fff876e5602e48120a85e26502afbfd..cf124eccf81cd1497464be36b3088b491e8f42a7 100644 (file)
--- a/test/confs/4002
+++ b/test/confs/4002
@@ -1,30 +1,53 @@
-# Exim test configuration 4002
-# Content-scan: aveserver interface
+# Exim test configuration 4001:  ACL regex=

 
 .include DIR/aux-var/std_conf_prefix
 
 
 .include DIR/aux-var/std_conf_prefix
 

-log_selector = +subject

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

+rfc1413_query_timeout = 0s

 
 

-av_scanner = aveserver : DIR/eximdir/aveserver_sock

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

-acl_smtp_rcpt = accept
-acl_smtp_data = c_data
+acl_smtp_rcpt = check_rcpt
+acl_smtp_data = check_data
+acl_not_smtp  = check_data
+
+
+# ----- ACL -----

 
 begin acl
 
 
 begin acl
 

-c_data:
-  accept !malware = * OPT
-  deny  logwrite = malware_name $malware_name
+check_rcpt:
+  accept
+
+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
 
 
 # ----- Routers -----
 
 begin routers
 

-r:
-  driver = redirect
-  data = :blackhole:
+r1:
+  driver = accept
+  transport = t1
+
+# ----- Transports -----
+
+begin transports
+
+t1:
+  driver = appendfile
+  file = DIR/test-mail/${bless:$local_part}
+  user = CALLER
+

 
 # End
 
 # End