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
Merge branch 'master'
[users/heiko/exim.git]
/
test
/
confs
/
1010
diff --git
a/test/confs/1010
b/test/confs/1010
index 4a4929bcf9c7613b0a7c3c9b201754568de35c96..ac4407168c0fe588d6c2c4eaa49fc6cb4d81535e 100644
(file)
--- a/
test/confs/1010
+++ b/
test/confs/1010
@@
-1,13
+1,14
@@
# Exim test configuration 1010
exim_path = EXIM_PATH
# Exim test configuration 1010
exim_path = EXIM_PATH
+keep_environment =
host_lookup_order = bydns
primary_hostname = myhost.test.ex
host_lookup_order = bydns
primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
spool_directory = DIR/spool
log_file_path = DIR/spool/log/%slog
gecos_pattern = ""
gecos_name = CALLER_NAME
+tls_advertise_hosts =
# ----- Main settings -----
# ----- Main settings -----