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 dec90620a0317e70ca21e6ae555131058d666384..52b28018a1964efb32ce632dfaa1d9cc99068c1e 100644 (file)
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -19,7 +19,8 @@ acl_smtp_data = accept
 begin acl
 
 logger:
-    accept logwrite = \
+    accept condition = ${if eq {$acl_arg2}{domain1}}
+          logwrite = \
            $acl_arg1 \
            ip <$tpda_delivery_ip> \
            port <$tpda_delivery_port> \
@@ -32,11 +33,17 @@ logger:
            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
@@ -54,7 +61,7 @@ smtp:
   port = PORT_S
   command_timeout = 1s
   final_timeout = 1s
-  tpda_delivery_action =   ${acl {logger}{delivery}}
-  tpda_host_defer_action = ${acl {logger}{deferral}}
+  tpda_delivery_action =   ${acl {logger} {delivery} {$domain} }
+  tpda_host_defer_action = ${acl {logger} {deferral} {$domain} }
 
 # End