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

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

diff --git a/test/confs/3400 b/test/confs/3400
index b84ee56c41f73ec5124eaf9891fd8dc1046f4401..8496e435b9c6e687dbefc6bd07fc61c9b1a285e8 100644 (file)
--- a/test/confs/3400
+++ b/test/confs/3400
@@ -1,13 +1,14 @@
 # Exim test configuration 3400
 
 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 -----
 
@@ -17,6 +18,7 @@ hostlist auth_hosts = 10.0.0.1
 hostlist relay_hosts = 10.0.0.4
 hostlist auth_relay_hosts = 10.0.0.3 : 10.0.0.4
 
+acl_smtp_connect = check_connect
 acl_smtp_etrn = check_etrn
 acl_smtp_expn = check_expn
 acl_smtp_rcpt = check_recipient
@@ -32,6 +34,11 @@ trusted_users = CALLER
 
 begin acl
 
+check_connect:
+  warn     hosts = 10.0.0.6
+           control = allow_auth_unadvertised
+  accept
+
 check_recipient:
   warn     hosts = 10.0.0.5
            message = authentication-failed: $authentication_failed