Apply timeout consistently to all malware scanner types

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

diff --git a/test/confs/5860 b/test/confs/5860
index 7dc4b0952c27e40b7e14fddca2fbaf5fbd93bdb0..d3f6db3c4cf0e3afb9d4d9493bb1386293fb6d59 100644 (file)
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -1,4 +1,4 @@
-# Exim test configuration 5850
+# Exim test configuration 5860

 # DANE
 
 SERVER=
 # DANE
 
 SERVER=


@@ -6,7 +6,6 @@ SERVER=
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""


@@ -43,13 +42,13 @@ tls_privatekey = ${if eq {SERVER}{server} \
 begin acl
 
 logger:
 begin acl
 
 logger:

-  accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}}
-        logwrite = $tpda_event depth = $tpda_data \
+  accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}}
+        logwrite = $event_name depth = $event_data \

                        <${certextract {subject} {$tls_out_peercert}}>
 #  message = noooo
 
                        <${certextract {subject} {$tls_out_peercert}}>
 #  message = noooo
 

-  accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}}
-        logwrite = $tpda_event dane=$tls_out_dane
+  accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}}
+        logwrite = $event_name dane=$tls_out_dane

   accept
 
 # ----- Routers -----
   accept
 
 # ----- Routers -----


@@ -83,6 +82,6 @@ send_to_server:
                                 {= {0}{$tls_out_tlsa_usage}} } \
                         {*}{}}
 
                                 {= {0}{$tls_out_tlsa_usage}} } \
                         {*}{}}
 

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

 
 # End
 
 # End