X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/83b2729321db62e758a300e372b2dd74e527d004..ed0512a1a151a4108d7fe309055219c2da3b2bbc:/test/confs/5860 diff --git a/test/confs/5860 b/test/confs/5860 index 7dc4b0952..d3f6db3c4 100644 --- a/test/confs/5860 +++ b/test/confs/5860 @@ -1,4 +1,4 @@ -# Exim test configuration 5850 +# Exim test configuration 5860 # DANE SERVER= @@ -6,7 +6,6 @@ SERVER= 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 = "" @@ -43,13 +42,13 @@ tls_privatekey = ${if eq {SERVER}{server} \ 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 - 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 ----- @@ -83,6 +82,6 @@ send_to_server: {= {0}{$tls_out_tlsa_usage}} } \ {*}{}} - tpda_event_action = ${acl {logger}} + event_action = ${acl {logger}} # End