Delivery: quieten smtp transport conn reuse vs. delivery race. Bug 1810

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

diff --git a/test/confs/5500 b/test/confs/5500
index 1bc830ef41a1a332d58fb85dde8b188cd79dda35..df818af1f4ebf67677cfc6625ae35785fed70cb3 100644 (file)
--- a/test/confs/5500
+++ b/test/confs/5500
@@ -4,13 +4,14 @@
 LOG_SELECTOR=
 
 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 -----
 
@@ -23,6 +24,7 @@ trusted_users = CALLER
 
 prdr_enable = true
 
+acl_smtp_mail = mail_acl
 acl_smtp_rcpt = accept
 acl_smtp_data_prdr = prdr_acl
 acl_smtp_data = data_acl
@@ -31,6 +33,9 @@ acl_smtp_data = data_acl
 
 begin acl
 
+mail_acl:
+  accept logwrite = prdr_requested: <$prdr_requested>
+
 prdr_acl:
   defer        local_parts = usery
   deny local_parts = userz
@@ -57,10 +62,4 @@ r0:
   driver = accept
   transport = t1
 
-# ----- Retry -----
-
-begin retry
-
-*                *   F,5d,5m
-
 # End