GnuTLS: fix for clients offering no TLS extensions

[exim.git] / test / stdout / 0572

diff --git a/test/stdout/0572 b/test/stdout/0572
index 8b7a17a781def993d4f4f7e2f2c695f349d18adf..2aa0d9b2dc1c2911ae19818c72a33fd49547ce77 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -41,30 +41,32 @@ data_timeout = 5m
 delay_after_cutoff
 dns_qualify_single
 no_dns_search_parents
-dnssec_request_domains = 
+dnssec_request_domains = *
 dnssec_require_domains = 
 dscp = 
 fallback_hosts = 
 final_timeout = 10m
 no_gethostbyname
 helo_data = $primary_hostname
+host_name_extract = ${if and {{match{$host}{.outlook.com\$}} {match{$item}{\N^250-([\w.]+)\s\N}}} {$1}}
 hosts = 
 hosts_avoid_esmtp = 
 hosts_avoid_pipelining = 
 hosts_max_try = 5
 hosts_max_try_hardlimit = 50
-hosts_noproxy_tls = *
 no_hosts_override
 no_hosts_randomize
+hosts_require_alpn = 
 hosts_require_auth = 
 hosts_try_auth = 
 hosts_try_chunking = *
-hosts_try_fastopen = 
+hosts_try_fastopen = :
 hosts_try_prdr = *
 interface = ip4.ip4.ip4.ip4
 keepalive
 no_lmtp_ignore_quota
 max_rcpt = 100
+message_linelength_limit = 998
 multi_domain
 port = 1224
 protocol = smtp
@@ -79,19 +81,22 @@ OPT =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"
-keep_environment = PATH
+keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 exim_path = TESTSUITE/eximdir/exim
 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+dns_cname_loops = 9
 chunking_advertise_hosts =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 5 "TESTSUITE/test-config"
 primary_hostname = myhost.test.ex
 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
+hide domainlist hidden_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
 
 begin routers
@@ -110,7 +115,9 @@ begin transports
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
+    hosts_try_fastopen = :
     debug_print = transport_name <$transport_name>
+
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =
@@ -118,19 +125,22 @@ OPT =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"
-keep_environment = PATH
+keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys
 exim_path = TESTSUITE/eximdir/exim
 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+dns_cname_loops = 9
 chunking_advertise_hosts =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 5 "TESTSUITE/test-config"
 primary_hostname = myhost.test.ex
 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
+hide domainlist hidden_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept
 begin routers
 my_main_router:
@@ -145,4 +155,5 @@ my_smtp:
 driver = smtp
 interface = ip4.ip4.ip4.ip4
 port = 1224
+hosts_try_fastopen = :
 debug_print = transport_name <$transport_name>