Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / confs / 5611

diff --git a/test/confs/5611 b/test/confs/5611
index 3309870a3a09ba2aa52ae2892c574d8dcc07bebc..09c81ffe90fbb8608dca0b3b8256b8a7718a7fc5 100644 (file)
--- a/test/confs/5611
+++ b/test/confs/5611
@@ -13,6 +13,10 @@ gecos_name = CALLER_NAME
 chunking_advertise_hosts =
 primary_hostname = server1.example.com
 
 chunking_advertise_hosts =
 primary_hostname = server1.example.com
 

+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+

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


@@ -81,7 +85,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 


@@ -90,6 +94,7 @@ send_to_server1:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *


@@ -103,6 +108,7 @@ send_to_server2:
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D
   allow_localhost
   hosts = HOSTIPV4
   port = PORT_D

+  hosts_try_fastopen = :

   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   hosts_require_tls = *


@@ -116,6 +122,7 @@ send_to_server3:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =


@@ -130,6 +137,7 @@ send_to_server4:
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D
   allow_localhost
   hosts = 127.0.0.1
   port = PORT_D

+  hosts_try_fastopen = :

   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   tls_verify_cert_hostnames =