X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/4466248715466b6f251454283642b74de65e9d9a..76559d089feff1a4915e3f1b3d539974a731cf42:/test/confs/5600 diff --git a/test/confs/5600 b/test/confs/5600 index cd5f3c8e7..7526b9cc4 100644 --- a/test/confs/5600 +++ b/test/confs/5600 @@ -3,14 +3,9 @@ CRL= -exim_path = EXIM_PATH -host_lookup_order = bydns +.include DIR/aux-var/tls_conf_prefix + primary_hostname = server1.example.com -rfc1413_query_timeout = 0s -spool_directory = DIR/spool -log_file_path = DIR/spool/log/%slog -gecos_pattern = "" -gecos_name = CALLER_NAME # ----- Main settings ----- @@ -32,7 +27,7 @@ tls_verify_hosts = HOSTIPV4 tls_try_verify_hosts = * tls_verify_certificates = DIR/aux-fixed/cert2 tls_crl = CRL -tls_ocsp_file = OCSP +tls_ocsp_file = RETURN # ------ ACL ------ @@ -40,10 +35,14 @@ tls_ocsp_file = OCSP begin acl check_connect: - accept logwrite = acl_conn: ocsp in status: $tls_in_ocsp + 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 + 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 @@ -67,7 +66,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER