Merge branch '4.next'

[users/jgh/exim.git] / test / aux-var-src / tls_conf_prefix

diff --git a/test/aux-var-src/tls_conf_prefix b/test/aux-var-src/tls_conf_prefix
index 0a14cee24ae2264880d0d81dc64db9dfe5c173c1..541817668b0b57098e9583fe2c5f965b5f11ac32 100644 (file)
--- a/test/aux-var-src/tls_conf_prefix
+++ b/test/aux-var-src/tls_conf_prefix
@@ -1,4 +1,5 @@
-keep_environment = PATH
+keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+add_environment = SSLKEYLOGFILE=DIR/spool/sslkeys

 exim_path = EXIM_PATH
 host_lookup_order = bydns
 spool_directory = DIR/spool
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 spool_directory = DIR/spool


@@ -20,3 +21,6 @@ tls_advertise_requiretls =
 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :
 .endif
 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :
 .endif

+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif