Merge branch '4.next'

[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 1c464f63e6d8ebc4c99c50c63b0e1b5803c99401..226f403071a281231ad2c6aa3124fb7c190f3597 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:SSLKEYLOGFILE
+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


@@ -14,12 +15,12 @@ gecos_name = CALLER_NAME
 dns_cname_loops = 9
 chunking_advertise_hosts =
 
 dns_cname_loops = 9
 chunking_advertise_hosts =
 

-.ifdef _HAVE_REQTLS
-tls_advertise_requiretls =
-.endif

 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :
 .endif
 .ifdef _HAVE_DMARC
 dmarc_tld_file =
 .endif
 .ifdef _HAVE_PIPE_CONNECT
 pipelining_connect_advertise_hosts = :
 .endif
 .ifdef _HAVE_DMARC
 dmarc_tld_file =
 .endif

+.ifdef _EXP_LIMITS
+limits_advertise_hosts = !*
+.endif