X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/bfe645c1570343d3adca657ab67998e122ca8792..2f06ffd252140e2cb71050aa8a9d45a75bc3437b:/test/confs/5740?ds=inline diff --git a/test/confs/5740 b/test/confs/5740 index e20a8b601..53302c507 100644 --- a/test/confs/5740 +++ b/test/confs/5740 @@ -4,12 +4,18 @@ SERVER = exim_path = EXIM_PATH +keep_environment = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$ host_lookup_order = bydns -primary_hostname = server1.example.com spool_directory = DIR/spool log_file_path = DIR/spool/log/SERVER%slog gecos_pattern = "" gecos_name = CALLER_NAME +chunking_advertise_hosts = +primary_hostname = server1.example.com + +.ifdef _HAVE_DMARC +dmarc_tld_file = +.endif # ----- Main settings ----- @@ -19,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 = * @@ -37,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 ------ @@ -69,7 +75,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}}} \ }}}