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
/
5204
diff --git
a/test/confs/5204
b/test/confs/5204
index 5846f5b11e6f9e22f31fd8d3119022dd7930022e..e44645991f490976bcf9e894ecb835a82ad0becf 100644
(file)
--- a/
test/confs/5204
+++ b/
test/confs/5204
@@
-3,13
+3,14
@@
COMMAND_USER=EXIMUSER
exim_path = EXIM_PATH
COMMAND_USER=EXIMUSER
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 -----