X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/774ef2d7d0f7fffbfd114271b8567e36485898dc..aa368db3cd1fe1040bfe90ec1673e9a7c798db9b:/test/confs/5700?ds=sidebyside

diff --git a/test/confs/5700 b/test/confs/5700
index 2df63415d..031e690b3 100644
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -1,12 +1,7 @@
 # Exim test configuration 5700
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+.include DIR/aux-var/std_conf_prefix
+
 
 # ----- Main settings -----
 
@@ -46,6 +41,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
@@ -57,29 +64,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
@@ -105,6 +104,7 @@ others:
   route_list = * 127.0.0.1 byname
   self = send
   transport = smtp
+  errors_to = ""
   no_more