Merge branch 'master'

[users/heiko/exim.git] / test / confs / 4000

diff --git a/test/confs/4000 b/test/confs/4000
index febe9a5e76e20624ba4f6020343ba8e074bb4af6..bc4ccd8fd0dd9c4834aa870ddf6229edb0b5cb55 100644 (file)
--- a/test/confs/4000
+++ b/test/confs/4000
@@ -1,13 +1,15 @@
 # Exim test configuration 4000
 
 exim_path = EXIM_PATH
 # Exim test configuration 4000
 
 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

+log_selector = +subject
+tls_advertise_hosts =

 
 
 # ----- Main settings -----
 
 
 # ----- Main settings -----