Testsuite: cutthrough vs. callout cache

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

diff --git a/test/confs/5860 b/test/confs/5860
index 956a5dc37f3f30b5380f424faa4bd45f6d456caa..eae2edb0d634a91f201f67c50a5a565aa0bec946 100644 (file)
--- a/test/confs/5860
+++ b/test/confs/5860
@@ -4,9 +4,9 @@
 SERVER=
 
 exim_path = EXIM_PATH
 SERVER=
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 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 +43,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 +83,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