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

diff --git a/test/confs/5700 b/test/confs/5700
index 4d0abea55..db1aa2a6e 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -6,6 +6,7 @@ spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -45,6 +46,18 @@ ev_msg_fail:
 	    domain <$domain> \
 	    reason <$event_data>
 
+ev_msg_log:
+    accept logwrite = . \
+	    $acl_arg1 \
+	    ip <$host_address> \
+	    port <$host_port> \
+	    fqdn <$host> \
+	    local_part <$local_part> \
+	    domain <$domain> \
+	    $acl_arg2 \
+	    router <$router_name> \
+	    transport <$transport_name>
+
 ev_msg:
     accept condition = ${if eq {fail} {${listextract{2}{$event_name}}}}
 	   acl = ev_msg_fail
@@ -56,29 +69,21 @@ ev_msg:
 	   logwrite = $this_expansion_will_fail
 
     accept condition = ${if eq {$event_name}{msg:delivery}}
-	   logwrite = . \
-	    delivery \
-	    ip <$host_address> \
-	    port <$host_port> \
-	    fqdn <$host> \
-	    local_part <$local_part> \
-	    domain <$domain> \
-	    confirmation <$event_data> \
-	    router <$router_name> \
-	    transport <$transport_name>
+	   acl = ev_msg_log delivery "confirmation <$event_data>"
 
     accept condition = ${if eq {$event_name}{msg:host:defer}}
-	   logwrite = . \
-	    deferral \
-	    ip <$host_address> \
-	    port <$host_port> \
-	    fqdn <$host> \
-	    local_part <$local_part> \
-	    domain <$domain> \
-	    errno <$event_defer_errno> \
-	    errstr <$event_data> \
-	    router <$router_name> \
-	    transport <$transport_name>
+	   acl = ev_msg_log "host deferral" \
+			"errno <$event_defer_errno> errstr <$event_data>"
+
+    accept condition = ${if eq {$event_name}{msg:rcpt:defer}}
+	   set acl_m_ev_lkup =	${eval:$event_defer_errno & 0xff}
+	   set acl_m_ev_lkup =	${if = {$acl_m_ev_lkup}{65} {A} \
+				{ ${if = {$acl_m_ev_lkup}{77} {MX} \
+				  {$acl_m_ev_lkup}}}}
+	   set acl_m_ev_code =  4${eval:$event_defer_errno >>8}
+	   acl = ev_msg_log "rcpt deferral" \
+			"err <$event_defer_errno>:<$acl_m_ev_lkup:$acl_m_ev_code> \
+			errstr <$event_data>"
 
 logger:
     warn   logwrite = event $event_name
@@ -104,6 +109,7 @@ others:
   route_list = * 127.0.0.1 byname
   self = send
   transport = smtp
+  errors_to = ""
   no_more