X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/44bc8f0c2f3576b46bd6df1b818cb29eaf84df5b..e9cecc465a570c1a4f34b199eae6bdd0a52ee2b0:/test/confs/5740?ds=sidebyside

diff --git a/test/confs/5740 b/test/confs/5740
index 2f0fc25c5..5dcbcb5bb 100644
--- a/test/confs/5740
+++ b/test/confs/5740
@@ -13,6 +13,10 @@ gecos_name = CALLER_NAME
 chunking_advertise_hosts =
 primary_hostname = server1.example.com
 
+.ifdef _HAVE_DMARC
+dmarc_tld_file =
+.endif
+
 
 # ----- Main settings -----
 
@@ -21,7 +25,7 @@ domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = check_recipient
 acl_smtp_data = check_data
 
-log_selector = +tls_peerdn
+log_selector = +tls_peerdn +received_recipients
 remote_max_parallel = 1
 
 tls_advertise_hosts = *
@@ -39,7 +43,7 @@ tls_privatekey = ${if eq {SERVER}{server}\
 {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\
 fail}
 
-tls_ocsp_file = OCSP
+tls_ocsp_file = RETURN
 
 
 # ------ ACL ------
@@ -57,6 +61,7 @@ check_data:
 
 logger:
   accept condition = ${if !eq {msg} {${listextract{1}{$event_name}}}}
+  accept condition = ${if eq {host} {${listextract{2}{$event_name}}}}
   warn	logwrite = client ocsp status: $tls_out_ocsp \
     (${listextract {${eval:$tls_out_ocsp+1}} \
 		{notreq:notresp:vfynotdone:failed:verified}})
@@ -71,7 +76,7 @@ client:
   condition = ${if eq {SERVER}{server}{no}{yes}}
   retry_use_local_part
   transport = send_to_server${if eq{$local_part}{nostaple}{1} \
-				{${if eq{$local_part}{norequire} {2} \
+				{${if match{$local_part}{norequire} {2} \
 				{${if eq{$local_part}{smtps} {4}{3}}} \
 			     }}}
 
@@ -88,7 +93,7 @@ begin transports
 
 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
 
@@ -98,6 +103,7 @@ send_to_server1:
   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 =	*
@@ -111,6 +117,7 @@ send_to_server2:
   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 =	*
@@ -124,6 +131,7 @@ send_to_server3:
   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 =
@@ -138,6 +146,7 @@ send_to_server4:
   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 =