Move certificate name checking to mainline, default enabled

[exim.git] / test / confs / 5658

diff --git a/test/confs/5658 b/test/confs/5658
index e4c346a965221c40020dc572c7d64f01b0e5c4bd..de486e083f3d370246b45ed5008c56699beb1625 100644 (file)
--- a/test/confs/5658
+++ b/test/confs/5658
@@ -1,5 +1,5 @@
 # Exim test configuration 5658
-# OCSP stapling, client, tpda
+# OCSP stapling, client, events
 
 SERVER =
 
@@ -52,7 +52,7 @@ check_data:
   accept
 
 logger:
-  accept condition = ${if !eq {msg} {${listextract{1}{$tpda_event}}}}
+  accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}}
   warn logwrite = client ocsp status: $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
@@ -95,12 +95,13 @@ send_to_server1:
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
   hosts_require_tls = *
   hosts_request_ocsp = :
   headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
-  tpda_event_action =  ${acl {logger}}
+  event_action =       ${acl {logger}}
 
 send_to_server2:
   driver = smtp
@@ -108,12 +109,13 @@ send_to_server2:
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
   hosts_require_tls = *
 # note no ocsp mention here
   headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
-  tpda_event_action =  ${acl {logger}}
+  event_action =       ${acl {logger}}
 
 send_to_server3:
   driver = smtp
@@ -123,12 +125,13 @@ send_to_server3:
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
   hosts_require_tls =  *
   hosts_require_ocsp = *
   headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
-  tpda_event_action =  ${acl {logger}}
+  event_action =       ${acl {logger}}
 
 send_to_server4:
   driver = smtp
@@ -138,13 +141,14 @@ send_to_server4:
   helo_data = helo.data.changed
   #tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
+  tls_verify_cert_hostnames =
   protocol =           smtps
   hosts_require_tls =  *
   hosts_require_ocsp = *
   headers_add = X-TLS-out: OCSP status $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
                {notreq:notresp:vfynotdone:failed:verified}})
-  tpda_event_action =  ${acl {logger}}
+  event_action =       ${acl {logger}}
 
 
 # ----- Retry -----