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
/
0197
diff --git
a/test/confs/0197
b/test/confs/0197
index 175b671cba65ddeed96a71dfd0a9acca0a2290d8..0ed172695f0662669c273fbdb1c6444d6e8008cc 100644
(file)
--- a/
test/confs/0197
+++ b/
test/confs/0197
@@
-4,12
+4,13
@@
# and these settings.
exim_path = EXIM_PATH
# and these settings.
exim_path = EXIM_PATH
+keep_environment =
host_lookup_order = bydns
host_lookup_order = bydns
-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 =
queue_run_in_order
trusted_users = CALLER
queue_run_in_order
trusted_users = CALLER