Merge branch 'master'

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

diff --git a/test/confs/0095 b/test/confs/0095
index 1bd71acaa17b4223e22c78caf31ebce113c6023b..fb79c9d289206413f1def7ca4744da50de0878a2 100644 (file)
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -1,16 +1,21 @@
 # Exim test configuration 0095
 
+ERT=
+QWM=
+
 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/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+tls_advertise_hosts =
 
 # ----- Main settings -----
 
+ERT
 
 # ----- Routers -----
 
@@ -43,6 +48,7 @@ appendfile:
   file = DIR/test-mail/$local_part
   quota = $h_quota
   quota_warn_threshold = $h_threshold
+  QWM
   user = CALLER
 
 appendfile2: