X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/0f06b4f296802e4e13188c740ea09419931a3020..789f8a4f4046120b7ae2aafa45f7f45c3ae4c8f5:/test/confs/5860?ds=sidebyside diff --git a/test/confs/5860 b/test/confs/5860 index 7dc4b0952..eae2edb0d 100644 --- a/test/confs/5860 +++ b/test/confs/5860 @@ -1,12 +1,12 @@ -# Exim test configuration 5850 +# Exim test configuration 5860 # DANE SERVER= exim_path = EXIM_PATH +keep_environment = 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 +43,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 +83,6 @@ send_to_server: {= {0}{$tls_out_tlsa_usage}} } \ {*}{}} - tpda_event_action = ${acl {logger}} + event_action = ${acl {logger}} # End