Merge branch '4.next'
[users/heiko/exim.git] / test / confs / 0906
index ff99d9304cca3f059e8ca4010871e51fdb99aa40..0310653593ec90960d84c99a163afa50c7a7b3f0 100644 (file)
@@ -13,6 +13,9 @@ 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 -----
 
@@ -71,7 +74,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
@@ -82,12 +85,14 @@ remote_smtp:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_D
+  hosts_try_fastopen = :
   allow_localhost
 
 remote_smtp_dkim:
   driver = smtp
   hosts =      127.0.0.1
   port =       PORT_D
+  hosts_try_fastopen = :
   allow_localhost
 
 .ifdef OPT