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
/
0522
diff --git
a/test/confs/0522
b/test/confs/0522
index 6b410b3a59a817b0d3c448a0195e05906c8db4a4..fb282b6e708f9a8eb17dcaac614ed06920c30663 100644
(file)
--- a/
test/confs/0522
+++ b/
test/confs/0522
@@
-3,13
+3,14
@@
TIMEOUTDEFER=
exim_path = EXIM_PATH
TIMEOUTDEFER=
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 -----