tidying

[exim.git] / test / stdout / 0572

diff --git a/test/stdout/0572 b/test/stdout/0572
index bd537bc446e091336fbea46401d8a1ad96776675..acfa5a0cd52910dd60c5f568a74dbb812ef160bf 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -39,76 +39,63 @@ connect_timeout = 5m
 connection_max_messages = 500
 data_timeout = 5m
 delay_after_cutoff
 connection_max_messages = 500
 data_timeout = 5m
 delay_after_cutoff

-dkim_canon = 
-dkim_domain = 
-dkim_private_key = 
-dkim_selector = 
-dkim_sign_headers = 
-dkim_strict = 

 dns_qualify_single
 no_dns_search_parents
 dns_qualify_single
 no_dns_search_parents

-dnssec_request_domains = 
+dnssec_request_domains = *

 dnssec_require_domains = 
 dscp = 
 fallback_hosts = 
 final_timeout = 10m
 no_gethostbyname
 dnssec_require_domains = 
 dscp = 
 fallback_hosts = 
 final_timeout = 10m
 no_gethostbyname

-gnutls_require_kx = 
-gnutls_require_mac = 
-gnutls_require_protocols = 

 helo_data = $primary_hostname
 hosts = 
 hosts_avoid_esmtp = 
 hosts_avoid_pipelining = 
 helo_data = $primary_hostname
 hosts = 
 hosts_avoid_esmtp = 
 hosts_avoid_pipelining = 

-hosts_avoid_tls = 

 hosts_max_try = 5
 hosts_max_try_hardlimit = 50
 hosts_max_try = 5
 hosts_max_try_hardlimit = 50

-hosts_nopass_tls = 

 no_hosts_override
 no_hosts_randomize
 no_hosts_override
 no_hosts_randomize

-hosts_request_ocsp = *
+hosts_require_alpn = 

 hosts_require_auth = 
 hosts_require_auth = 

-hosts_require_ocsp = 
-hosts_require_tls = 

 hosts_try_auth = 
 hosts_try_auth = 

+hosts_try_chunking = *
+hosts_try_fastopen = :

 hosts_try_prdr = *
 hosts_try_prdr = *

-hosts_verify_avoid_tls = 

 interface = ip4.ip4.ip4.ip4
 keepalive
 no_lmtp_ignore_quota
 max_rcpt = 100
 interface = ip4.ip4.ip4.ip4
 keepalive
 no_lmtp_ignore_quota
 max_rcpt = 100

+message_linelength_limit = 998

 multi_domain
 port = 1224
 protocol = smtp
 retry_include_ip_address
 serialize_hosts = 
 size_addition = 1024
 multi_domain
 port = 1224
 protocol = smtp
 retry_include_ip_address
 serialize_hosts = 
 size_addition = 1024

-socks_proxy = 127.0.0.1 port=1225
-tls_certificate = 
-tls_crl = 
-tls_dh_min_bits = 1024
-tls_privatekey = 
-tls_require_ciphers = 
-tls_sni = 
-tls_tempfail_tryclear
-tls_try_verify_hosts = *
-tls_verify_cert_hostnames = *
-tls_verify_certificates = system
-tls_verify_hosts = 

 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =
 
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"
 OPT =

+# 5 "TESTSUITE/test-config"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/tls_conf_prefix"
+keep_environment = PATH:EXIM_TESTHARNESS_DISABLE_OCSPVALIDITYCHECK
+add_environment = SSLKEYLOGFILE=TESTSUITE/spool/sslkeys

 exim_path = TESTSUITE/eximdir/exim
 exim_path = TESTSUITE/eximdir/exim

-hide host_lookup_order = bydns
-primary_hostname = myhost.test.ex
+host_lookup_order = bydns

 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

-tls_advertise_hosts =
+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
 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
 acl_smtp_rcpt = accept
 
 begin routers


@@ -118,7 +105,7 @@ begin routers
     route_list = * 127.0.0.1
     self = send
     transport = my_smtp
     route_list = * 127.0.0.1
     self = send
     transport = my_smtp

-    debug_print = router_name <$router_name>
+    hide debug_print = router_name <$router_name>

     no_more
 
 begin transports
     no_more
 
 begin transports


@@ -127,5 +114,45 @@ begin transports
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224

-    hide socks_proxy = 127.0.0.1 port=1225
+    hosts_try_fastopen = :

     debug_print = transport_name <$transport_name>
     debug_print = transport_name <$transport_name>

+
+# Exim Configuration (X)
+# 1 "TESTSUITE/test-config"
+OPT =
+# 5 "TESTSUITE/test-config"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/std_conf_prefix"
+# 1 "TESTSUITE/aux-var/tls_conf_prefix"
+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:
+driver = manualroute
+route_list = * 127.0.0.1
+self = send
+transport = my_smtp
+hide debug_print = router_name <$router_name>
+no_more
+begin transports
+my_smtp:
+driver = smtp
+interface = ip4.ip4.ip4.ip4
+port = 1224
+hosts_try_fastopen = :
+debug_print = transport_name <$transport_name>