Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / confs / 5700

diff --git a/test/confs/5700 b/test/confs/5700
index a30098b52d3bc17d79718ff4763e9320d353a9e8..52b28018a1964efb32ce632dfaa1d9cc99068c1e 100644 (file)
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -13,32 +13,37 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 
-dbl_delivery_query = ${acl {logger}{delivery}}
-
 
 # ----- ACL -----
 
 begin acl
 
 logger:
-    accept logwrite = \
+    accept condition = ${if eq {$acl_arg2}{domain1}}
+          logwrite = \
            $acl_arg1 \
-           delivery_ip <$dbl_delivery_ip> \
-           deliver_port <$dbl_delivery_port> \
-           delivery_fqdn <$dbl_delivery_fqdn> \
-           local_part <$dbl_delivery_local_part> \
-           domain <$dbl_delivery_domain> \
-           confirmation <$dbl_delivery_confirmation> \
-           errno <$dbl_defer_errno> \
-           errstr <$dbl_defer_errstr> \
+           ip <$tpda_delivery_ip> \
+           port <$tpda_delivery_port> \
+           fqdn <$tpda_delivery_fqdn> \
+           local_part <$tpda_delivery_local_part> \
+           domain <$tpda_delivery_domain> \
+           confirmation <$tpda_delivery_confirmation> \
+           errno <$tpda_defer_errno> \
+           errstr <$tpda_defer_errstr> \
            router <$router_name> \
            transport <$transport_name>
 
+    accept logwrite = $this_expansion_will_fail
 
 # ----- Routers -----
 
 begin routers
 
+dump_bounces:
+  driver = redirect
+  senders = :
+  data = :blackhole:
+
 others:
   driver = manualroute
   route_list = * 127.0.0.1 byname
@@ -56,6 +61,7 @@ smtp:
   port = PORT_S
   command_timeout = 1s
   final_timeout = 1s
-  dbl_host_defer_query = ${acl {logger}{deferral}}
+  tpda_delivery_action =   ${acl {logger} {delivery} {$domain} }
+  tpda_host_defer_action = ${acl {logger} {deferral} {$domain} }
 
 # End