Move the regression test for CVE-2019-15846 to 1100-Basic-TLS/1100

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

diff --git a/test/confs/0906 b/test/confs/0906
index 0c7b83d5ec8726804fb84a82d70c06eae86899f2..6df517e53eafc10e8a3cc49d6cb76a211cba5781 100644 (file)
--- a/test/confs/0906
+++ b/test/confs/0906
@@ -10,6 +10,12 @@ gecos_pattern = ""
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}
 gecos_name = CALLER_NAME
 chunking_advertise_hosts = *
 tls_advertise_hosts = ${if eq {SRV}{tls} {*}}

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

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -19,7 +25,13 @@ primary_hostname = testhost.test.ex
 domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = acl_r
 domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = acl_r

+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else

 log_selector = +received_recipients
 log_selector = +received_recipients

+.endif
+

 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE
 tls_certificate = DIR/aux-fixed/cert1
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE
 tls_certificate = DIR/aux-fixed/cert1