X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/dddd62bfa0611ba20ef8303f4fae6e8a8b424ec8..edb1813543cf9b6f0d5a706b4ef55b718c94c7fd:/test/confs/5700

diff --git a/test/confs/5700 b/test/confs/5700
index 935d0adb2..dec90620a 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -13,26 +13,24 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 
-dbl_delivery_query = ${acl {a_logger}}
-
 
 # ----- ACL -----
 
 begin acl
 
-a_logger:
-    require logwrite = \
-	    A \
-	    1 <$dbl_delivery_ip> \
-	    2 <$dbl_delivery_port> \
-	    3 <$dbl_delivery_fqdn> \
-	    4 <$dbl_delivery_local_part> \
-	    5 <$dbl_delivery_domain> \
-	    6 <$dbl_delivery_confirmation> \
-	    7 <$dbl_defer_errno> \
-	    8 <$dbl_defer_errstr> \
-	    9 <$router_name> \
-	    10 <$transport_name>
+logger:
+    accept logwrite = \
+	    $acl_arg1 \
+	    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>
 
 
 # ----- Routers -----
@@ -41,7 +39,7 @@ begin routers
 
 others:
   driver = manualroute
-  route_list = domain1 127.0.0.1 byname
+  route_list = * 127.0.0.1 byname
   self = send
   transport = smtp
   no_more
@@ -54,5 +52,9 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
+  command_timeout = 1s
+  final_timeout = 1s
+  tpda_delivery_action =   ${acl {logger}{delivery}}
+  tpda_host_defer_action = ${acl {logger}{deferral}}
 
 # End