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..700b360a8cc6484f310d1788e0531d24722ad769 100644 (file)
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -13,8 +13,6 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 
-dbl_delivery_query = ${acl {logger}{delivery}}
-
 
 # ----- ACL -----
 
@@ -23,9 +21,9 @@ begin acl
 logger:
     accept logwrite = \
            $acl_arg1 \
-           delivery_ip <$dbl_delivery_ip> \
-           deliver_port <$dbl_delivery_port> \
-           delivery_fqdn <$dbl_delivery_fqdn> \
+           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> \
@@ -56,6 +54,7 @@ smtp:
   port = PORT_S
   command_timeout = 1s
   final_timeout = 1s
+  dbl_delivery_query =   ${acl {logger}{delivery}}
   dbl_host_defer_query = ${acl {logger}{deferral}}
 
 # End