Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / stdout / 0572

diff --git a/test/stdout/0572 b/test/stdout/0572
index d6efce012e62d1b90677a0269248a57846fa2482..d66f928d42dfb8f77af7970aa043772ca4f49a5d 100644 (file)
--- a/test/stdout/0572
+++ b/test/stdout/0572
@@ -41,7 +41,7 @@ data_timeout = 5m
 delay_after_cutoff
 dns_qualify_single
 no_dns_search_parents
 delay_after_cutoff
 dns_qualify_single
 no_dns_search_parents

-dnssec_request_domains = 
+dnssec_request_domains = *

 dnssec_require_domains = 
 dscp = 
 fallback_hosts = 
 dnssec_require_domains = 
 dscp = 
 fallback_hosts = 


@@ -57,6 +57,8 @@ no_hosts_override
 no_hosts_randomize
 hosts_require_auth = 
 hosts_try_auth = 
 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


@@ -76,18 +78,22 @@ OPT =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"
 # 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

-keep_environment =

 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 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
 # 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
 acl_smtp_rcpt = accept
 
 begin routers


@@ -106,6 +112,7 @@ begin transports
     driver = smtp
     interface = ip4.ip4.ip4.ip4
     port = 1224
     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"
     debug_print = transport_name <$transport_name>
 # Exim Configuration (X)
 # 1 "TESTSUITE/test-config"


@@ -114,18 +121,22 @@ OPT =
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/std_conf_prefix"
 # 1 "TESTSUITE/aux-var/tls_conf_prefix"
 # 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

-keep_environment =

 host_lookup_order = bydns
 spool_directory = TESTSUITE/spool
 log_file_path = TESTSUITE/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 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
 # 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:
 acl_smtp_rcpt = accept
 begin routers
 my_main_router:


@@ -140,4 +151,5 @@ my_smtp:
 driver = smtp
 interface = ip4.ip4.ip4.ip4
 port = 1224
 driver = smtp
 interface = ip4.ip4.ip4.ip4
 port = 1224

+hosts_try_fastopen = :

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