Merge branch 'master'
[users/heiko/exim.git] / test / confs / 3600
index fca55ff51b83dc43d24743b66b17e6d99832202e..7c6549f46c164c76fa692d19096aa6e584cf0a98 100644 (file)
@@ -3,13 +3,14 @@
 SERVER=
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+tls_advertise_hosts =
 
 # ----- Main settings -----