X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9fc9357028c3ada0ca912e2f58d002d8f4c7a321..a7538db17824b7fd70c12ef7561a67b85d6f247e:/test/confs/5608 diff --git a/test/confs/5608 b/test/confs/5608 index 55d9a2015..272d5f638 100644 --- a/test/confs/5608 +++ b/test/confs/5608 @@ -55,6 +55,7 @@ check_data: accept logger: + accept condition = ${if !eq {msg} {${listextract{1}{$tpda_event}}}} warn logwrite = client ocsp status: $tls_out_ocsp \ (${listextract {${eval:$tls_out_ocsp+1}} \ {notreq:notresp:vfynotdone:failed:verified}}) @@ -100,8 +101,7 @@ send_to_server1: hosts_require_tls = * hosts_request_ocsp = : headers_add = X-TLS-out: ocsp status $tls_out_ocsp - tpda_delivery_action = ${acl {logger}} - tpda_host_defer_action = ${acl {logger}} + tpda_event_action = ${acl {logger}} # norequire: request stapling but do not verify send_to_server2: @@ -113,8 +113,7 @@ send_to_server2: hosts_require_tls = * # note no ocsp mention here headers_add = X-TLS-out: ocsp status $tls_out_ocsp - tpda_delivery_action = ${acl {logger}} - tpda_host_defer_action = ${acl {logger}} + tpda_event_action = ${acl {logger}} # (any other name): request and verify send_to_server3: @@ -127,8 +126,7 @@ send_to_server3: hosts_require_tls = * hosts_require_ocsp = * headers_add = X-TLS-out: ocsp status $tls_out_ocsp - tpda_delivery_action = ${acl {logger}} - tpda_host_defer_action = ${acl {logger}} + tpda_event_action = ${acl {logger}} # (any other name): request and verify, ssl-on-connect send_to_server4: @@ -142,8 +140,7 @@ send_to_server4: hosts_require_tls = * hosts_require_ocsp = * headers_add = X-TLS-out: ocsp status $tls_out_ocsp - tpda_delivery_action = ${acl {logger}} - tpda_host_defer_action = ${acl {logger}} + tpda_event_action = ${acl {logger}} # ----- Retry -----