Merge branch 'master'

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

diff --git a/test/confs/0296 b/test/confs/0296
index 194f4043c9427d37d5ed9bfc66bd16fef882bbc6..9af8750157bfd253d6306c0a2edfa3b72c24982d 100644 (file)
--- a/test/confs/0296
+++ b/test/confs/0296
@@ -1,13 +1,14 @@
 # Exim test configuration 0296
 
 exim_path = EXIM_PATH
 # Exim test configuration 0296
 
 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 -----