Testsuite: fix Recieved: header munging for TLS info

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

diff --git a/test/confs/0906 b/test/confs/0906
index 2c47966eaa3deeedf7655f515427cf025c5b2d64..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} {*}}
+.ifdef _HAVE_PIPE_CONNECT
+pipelining_connect_advertise_hosts =
+.endif
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
 
 # ----- Main settings -----
 
@@ -19,13 +25,21 @@ primary_hostname = testhost.test.ex
 domainlist local_domains = @ : test.ex
 
 acl_smtp_rcpt = acl_r
+
+.ifdef _HAVE_DKIM
+log_selector = +received_recipients +dkim_verbose
+.else
 log_selector = +received_recipients
+.endif
+
 
 .ifdef _OPT_MAIN_TLS_CERTIFICATE
 tls_certificate = DIR/aux-fixed/cert1
 tls_privatekey = DIR/aux-fixed/cert1
 .endif
 
+queue_run_in_order = true
+
 # ----- ACL -----
 
 begin acl