Testsuite: avoid ipv6 when testing retry data

[users/jgh/exim.git] / test / confs / 5700

diff --git a/test/confs/5700 b/test/confs/5700
index 0856bb05622e33b234982b686daca4a606ee9f26..2df63415df4f34942718465007dd5b2335b88134 100644 (file)
--- a/test/confs/5700
+++ b/test/confs/5700
@@ -13,15 +13,17 @@ gecos_name = CALLER_NAME
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 
 acl_smtp_rcpt = accept
 acl_smtp_data = accept
 

+event_action = ${acl {logger}}
+

 
 # ----- ACL -----
 
 begin acl
 
 ev_tcp:
 
 # ----- ACL -----
 
 begin acl
 
 ev_tcp:

-    accept condition = ${if eq {$tpda_event}{tcp:connect}}
-          logwrite = . [$host_address]:$sending_port
-    accept condition = ${if eq {$tpda_event}{tcp:close}}
+    accept condition = ${if eq {$event_name}{tcp:connect}}
+          logwrite = . [$host_address]:$host_port
+    accept condition = ${if eq {$event_name}{tcp:close}}

           logwrite = . [$sending_ip_address] -> \
                        [$host_address]:$host_port
     accept
           logwrite = . [$sending_ip_address] -> \
                        [$host_address]:$host_port
     accept


@@ -30,13 +32,31 @@ ev_smtp:
     accept
           logwrite = . [$sending_ip_address] -> \
                        [$host_address]:$host_port
     accept
           logwrite = . [$sending_ip_address] -> \
                        [$host_address]:$host_port

-          logwrite = . banner <$tpda_data>
+          logwrite = . banner <$event_data>
+
+ev_msg_fail:
+    accept condition = ${if eq {$event_name}{msg:fail:delivery}}
+          logwrite = . \
+           refused by fdqn <$host> \
+           local_part <$local_part> \
+           domain <$domain> \
+
+    accept logwrite = . \
+           local_part <$local_part> \
+           domain <$domain> \
+           reason <$event_data>

 
 ev_msg:
 
 ev_msg:

-    accept condition = ${if !eq {$acl_arg2}{domain1}}
+    accept condition = ${if eq {fail} {${listextract{2}{$event_name}}}}
+          acl = ev_msg_fail
+
+    accept condition = ${if eq {$event_name}{msg:complete}}
+          logwrite = . finished: $message_exim_id
+
+    accept condition = ${if !eq {$domain}{domain1}}

           logwrite = $this_expansion_will_fail
 
           logwrite = $this_expansion_will_fail
 

-    accept condition = ${if eq {$acl_arg1}{msg:delivery}}
+    accept condition = ${if eq {$event_name}{msg:delivery}}

           logwrite = . \
            delivery \
            ip <$host_address> \
           logwrite = . \
            delivery \
            ip <$host_address> \


@@ -44,11 +64,11 @@ ev_msg:
            fqdn <$host> \
            local_part <$local_part> \
            domain <$domain> \
            fqdn <$host> \
            local_part <$local_part> \
            domain <$domain> \

-           confirmation <$tpda_data> \
+           confirmation <$event_data> \

            router <$router_name> \
            transport <$transport_name>
 
            router <$router_name> \
            transport <$transport_name>
 

-    accept condition = ${if eq {$acl_arg1}{msg:host:defer}}
+    accept condition = ${if eq {$event_name}{msg:host:defer}}

           logwrite = . \
            deferral \
            ip <$host_address> \
           logwrite = . \
            deferral \
            ip <$host_address> \


@@ -56,19 +76,19 @@ ev_msg:
            fqdn <$host> \
            local_part <$local_part> \
            domain <$domain> \
            fqdn <$host> \
            local_part <$local_part> \
            domain <$domain> \

-           errno <$tpda_defer_errno> \
-           errstr <$tpda_data> \
+           errno <$event_defer_errno> \
+           errstr <$event_data> \

            router <$router_name> \
            transport <$transport_name>
 
 logger:
            router <$router_name> \
            transport <$transport_name>
 
 logger:

-    warn   logwrite = event $tpda_event
-    accept condition = ${if eq {tcp} {${listextract{1}{$tpda_event}}}}
+    warn   logwrite = event $event_name
+    accept condition = ${if eq {tcp} {${listextract{1}{$event_name}}}}

           acl = ev_tcp
           acl = ev_tcp

-    accept condition = ${if eq {smtp} {${listextract{1}{$tpda_event}}}}
+    accept condition = ${if eq {smtp} {${listextract{1}{$event_name}}}}

           acl = ev_smtp
           acl = ev_smtp

-    accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
-          acl = ev_msg $tpda_event $acl_arg2
+    accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
+          acl = ev_msg

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


@@ -97,6 +117,6 @@ smtp:
   port = PORT_S
   command_timeout = 1s
   final_timeout = 1s
   port = PORT_S
   command_timeout = 1s
   final_timeout = 1s

-  tpda_event_action =   ${acl {logger} {$tpda_event} {$domain} }
+  event_action =   ${acl {logger}}

 
 # End
 
 # End