git://git.exim.org
/
users
/
heiko
/
exim.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Docs: Minor typos in spec and NewStuff (Closes 2649)
[users/heiko/exim.git]
/
test
/
stdout
/
0572
diff --git
a/test/stdout/0572
b/test/stdout/0572
index 0ea38119065164dd058459bf008aa43b118807da..fd77c72b7be163dad67999c7ad79d0ff797b62cb 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 =
@@
-58,12
+58,13
@@
no_hosts_randomize
hosts_require_auth =
hosts_try_auth =
hosts_try_chunking = *
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
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
multi_domain
port = 1224
protocol = smtp
@@
-78,7
+79,8
@@
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:SSLKEYLOGFILE
+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
exim_path = TESTSUITE/eximdir/exim
host_lookup_order = bydns
spool_directory = TESTSUITE/spool
@@
-92,6
+94,7
@@
chunking_advertise_hosts =
primary_hostname = myhost.test.ex
log_selector = +outgoing_port
domainlist local_domains = test.ex : *.test.ex
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
@@
-110,6
+113,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"
@@
-118,7
+122,8
@@
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:SSLKEYLOGFILE
+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
exim_path = TESTSUITE/eximdir/exim
host_lookup_order = bydns
spool_directory = TESTSUITE/spool
@@
-132,6
+137,7
@@
chunking_advertise_hosts =
primary_hostname = myhost.test.ex
log_selector = +outgoing_port
domainlist local_domains = test.ex : *.test.ex
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:
@@
-146,4
+152,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>