Move certificate name checking to mainline, default enabled

[exim.git] / test / confs / 5750

diff --git a/test/confs/5750 b/test/confs/5750
index bcb03ac5daae4c52e495afef7c84f863fe5f3f4e..193041d6267800b98f49cc78b12cca1fe148b1bf 100644 (file)
--- a/test/confs/5750
+++ b/test/confs/5750
@@ -11,6 +11,7 @@ spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+timezone = UTC

 
 # ----- Main settings -----
 
 
 # ----- 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
 
 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
 
 #
 
 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:
 ev_tls:

-  accept logwrite =  $tpda_event depth=$tpda_data \
+  accept logwrite =  $event_name depth=$event_data \

                        <${certextract {subject} {$tls_out_peercert}}>
 #       message = noooo
 
                        <${certextract {subject} {$tls_out_peercert}}>
 #       message = noooo
 


@@ -58,9 +68,9 @@ ev_msg:
         logwrite =       ${certextract {crl_uri}       {$tls_out_peercert} {CRU <$value>}{(no CRU)}}
 
 logger:
         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
 
         message =   ${acl {ev_tls}}
   accept
 


@@ -92,8 +102,9 @@ send_to_server:
        ${if eq {$local_part}{good}\
 {example.com/server1.example.com/ca_chain.pem}\
 {example.net/server1.example.net/ca_chain.pem}}
        ${if eq {$local_part}{good}\
 {example.com/server1.example.com/ca_chain.pem}\
 {example.net/server1.example.net/ca_chain.pem}}

+  tls_verify_cert_hostnames =

 
 

-  tpda_event_action =   ${acl {logger} {$tpda_event} {$domain} }
+  event_action =   ${acl {logger} {$event_name} {$domain} }

 
 # ----- Retry -----
 
 
 # ----- Retry -----