X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/a7538db17824b7fd70c12ef7561a67b85d6f247e..exim-4_85_RC1:/test/confs/5760 diff --git a/test/confs/5760 b/test/confs/5760 index c3b49d1b7..3417a2d32 100644 --- a/test/confs/5760 +++ b/test/confs/5760 @@ -11,6 +11,7 @@ spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME +timezone = UTC # ----- Main settings ----- @@ -29,12 +30,21 @@ tls_privatekey = DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.e tls_verify_hosts = * tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server2.example.com/ca_chain.pem +event_action = ${acl {server_cert_log}} + # begin acl +server_cert_log: + accept condition = ${if eq {tls:cert}{$event_name}} + logwrite = [$sender_host_address] \ + depth=$event_data \ + ${certextract{subject}{$tls_in_peercert}} + accept + ev_tls: - accept logwrite = $tpda_event depth=$tpda_data \ + accept logwrite = $event_name depth=$event_data \ <${certextract {subject} {$tls_out_peercert}}> # message = nooooo @@ -58,9 +68,9 @@ ev_msg: logwrite = ${certextract {crl_uri} {$tls_out_peercert} {CRU <$value>}{(no CRU)}} logger: - accept condition = ${if eq {msg} {${listextract{1}{$tpda_event}}}} - acl = ev_msg $tpda_event $acl_arg2 - accept condition = ${if eq {tls} {${listextract{1}{$tpda_event}}}} + accept condition = ${if eq {msg} {${listextract{1}{$event_name}}}} + acl = ev_msg $event_name $acl_arg2 + accept condition = ${if eq {tls} {${listextract{1}{$event_name}}}} message = ${acl {ev_tls}} accept @@ -93,7 +103,7 @@ send_to_server: {example.com/server1.example.com/ca_chain.pem}\ {example.net/server1.example.net/ca_chain.pem}} - tpda_event_action = ${acl {logger} {$tpda_event} {$domain} } + event_action = ${acl {logger} {$event_name} {$domain} } # ----- Retry -----