Improve the consistency of logging incoming and outgoing interfaces.

[users/jgh/exim.git] / test / confs / 5600

diff --git a/test/confs/5600 b/test/confs/5600
index 8b26ee7fa7ad5a997e74a83c73917c620d1e326e..2dc1090dfc5ed66689d27fd6575da8737833fe3d 100644 (file)
--- a/test/confs/5600
+++ b/test/confs/5600
@@ -6,7 +6,6 @@ CRL=
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = server1.example.com
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 primary_hostname = server1.example.com

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""


@@ -14,6 +13,8 @@ gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+acl_smtp_connect = check_connect
+acl_smtp_mail = check_mail

 acl_smtp_rcpt = check_recipient
 
 log_selector = +tls_peerdn
 acl_smtp_rcpt = check_recipient
 
 log_selector = +tls_peerdn


@@ -37,6 +38,16 @@ tls_ocsp_file = OCSP
 
 begin acl
 
 
 begin acl
 

+check_connect:
+  accept   logwrite = acl_conn: ocsp in status: $tls_in_ocsp \
+    (${listextract {${eval:$tls_in_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})
+
+check_mail:
+  accept   logwrite = acl_mail: ocsp in status: $tls_in_ocsp \
+    (${listextract {${eval:$tls_in_ocsp+1}} \
+               {notreq:notresp:vfynotdone:failed:verified}})
+

 check_recipient:
   deny     message = certificate not verified: peerdn=$tls_peerdn
          ! verify = certificate
 check_recipient:
   deny     message = certificate not verified: peerdn=$tls_peerdn
          ! verify = certificate