Logging: make cipher info available for continued-TLS connection deliveries

[users/heiko/exim.git] / test / stdout / 0572

diff --git a/test/stdout/0572 b/test/stdout/0572
index 0c8d6e9b765c3c8a1a4ed653f75a972ab7bbc5b3..8b7a17a781def993d4f4f7e2f2c695f349d18adf 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -53,10 +53,13 @@ hosts_avoid_esmtp =
 hosts_avoid_pipelining = 
 hosts_max_try = 5
 hosts_max_try_hardlimit = 50
 hosts_avoid_pipelining = 
 hosts_max_try = 5
 hosts_max_try_hardlimit = 50

+hosts_noproxy_tls = *

 no_hosts_override
 no_hosts_randomize
 hosts_require_auth = 
 hosts_try_auth = 
 no_hosts_override
 no_hosts_randomize
 hosts_require_auth = 
 hosts_try_auth = 

+hosts_try_chunking = *
+hosts_try_fastopen = 

 hosts_try_prdr = *
 interface = ip4.ip4.ip4.ip4
 keepalive
 hosts_try_prdr = *
 interface = ip4.ip4.ip4.ip4
 keepalive


@@ -72,14 +75,21 @@ size_addition = 1024
 # 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_path = TESTSUITE/eximdir/exim
 exim_path = TESTSUITE/eximdir/exim

-keep_environment =
-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

+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
 acl_smtp_rcpt = accept
 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept


@@ -104,14 +114,21 @@ begin transports
 # 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_path = TESTSUITE/eximdir/exim
 exim_path = TESTSUITE/eximdir/exim

-keep_environment =
-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

+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
 acl_smtp_rcpt = accept
 log_selector = +outgoing_port
 domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = accept