DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0585

diff --git a/test/confs/0585 b/test/confs/0585
index a0b35e7cfc8c6c369a59d1e73fc0cfa9a14f2e72..9bf8fc710d84847778972f57f21a2766eba7800d 100644 (file)
--- a/test/confs/0585
+++ b/test/confs/0585
@@ -1,33 +1,24 @@
 # Exim test configuration 0585
 
+ERROR_DETAILS=
+
 .include DIR/aux-var/std_conf_prefix
 
 primary_hostname = myhost.test.ex
 
 # ----- Main settings -----
 
+acl_smtp_rcpt = accept
+acl_smtp_data = check_data
 
+ERROR_DETAILS
 
-# ----- Routers -----
-
-begin routers
-
-r2:
-  driver = redirect
-  local_part_prefix = pipe-
-  local_part_suffix = =*
-  caseful_local_part = true
-  data = |${substr_1:$local_part_suffix}
-  pipe_transport = t2
-
+# ----- ACL ------
 
-# ----- Transports -----
+begin acl
 
-begin transports
+check_data:
+  accept  verify = not_blind/case_insensitive
 
-t2:
-  driver = pipe
-  user = CALLER
-  batch_max = 10
 
 # End