Move the native SRS implementation from Experimental to mainline

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

diff --git a/test/confs/4060 b/test/confs/4060
index 30d65a146fa358d2a76dff11430271f350c92717..f3aa84d6627ba3663eaf9e937f32b73c837d5e99 100644 (file)
--- a/test/confs/4060
+++ b/test/confs/4060
@@ -23,6 +23,10 @@ chunking_advertise_hosts = OPT
 tls_advertise_hosts = *
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 
 tls_advertise_hosts = *
 tls_certificate = ${if eq {SERVER}{server}{DIR/aux-fixed/cert1}fail}
 

+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+

 # Avoid ECDHE key-exchange so that we can wireshark-decode (not TLS1.3)
 .ifdef _HAVE_GNUTLS
 tls_require_ciphers = NORMAL:-KX-ALL:+RSA
 # Avoid ECDHE key-exchange so that we can wireshark-decode (not TLS1.3)
 .ifdef _HAVE_GNUTLS
 tls_require_ciphers = NORMAL:-KX-ALL:+RSA


@@ -30,7 +34,7 @@ tls_require_ciphers = NORMAL:-KX-ALL:+RSA
 tls_require_ciphers = DEFAULT:!kECDHE
 .endif
 
 tls_require_ciphers = DEFAULT:!kECDHE
 .endif
 

-pipelining_connect_advertise_hosts = *
+pipelining_connect_advertise_hosts = CONTROL

 log_selector = +received_recipients +millisec +pipelining
 queue_only
 
 log_selector = +received_recipients +millisec +pipelining
 queue_only