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 935d0adb29b4002efe09ccfe7df1be824b6304b3..700b360a8cc6484f310d1788e0531d24722ad769 100644 (file)
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -13,26 +13,24 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 

-dbl_delivery_query = ${acl {a_logger}}
-

 
 # ----- ACL -----
 
 begin acl
 
 
 # ----- 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 <$dbl_delivery_ip> \
+           port <$dbl_delivery_port> \
+           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> \
+           router <$router_name> \
+           transport <$transport_name>

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -41,7 +39,7 @@ begin routers
 
 others:
   driver = manualroute
 
 others:
   driver = manualroute

-  route_list = domain1 127.0.0.1 byname
+  route_list = * 127.0.0.1 byname

   self = send
   transport = smtp
   no_more
   self = send
   transport = smtp
   no_more


@@ -54,5 +52,9 @@ begin transports
 smtp:
   driver = smtp
   port = PORT_S
 smtp:
   driver = smtp
   port = PORT_S

+  command_timeout = 1s
+  final_timeout = 1s
+  dbl_delivery_query =   ${acl {logger}{delivery}}
+  dbl_host_defer_query = ${acl {logger}{deferral}}

 
 # End
 
 # End