X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=test%2Fconfs%2F2201;h=dce78ed7a435c711cc6a946a9198f15a16bcd1ed;hb=919795ff824f1aa4b0b0d7b301909f5aa273336a;hp=861db77ba852e11acf2e576931df77b09ba373d7;hpb=afda344b580b54a4513569720aec3260cd5ba546;p=exim.git

diff --git a/test/confs/2201 b/test/confs/2201
index 861db77ba..dce78ed7a 100644
--- a/test/confs/2201
+++ b/test/confs/2201
@@ -1,23 +1,51 @@
 # Exim test configuration 2201
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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
 
 # ----- Main settings -----
 
 trusted_users = CALLER
+disable_ipv6
+
+acl_smtp_rcpt = check_rcpt
+acl_not_smtp = check_sndr
+queue_only
+
+# - ACL --
+begin acl
+
+check_rcpt:
+	# Do not care about result, looking at debug output
+	# expect an original lookup, a cached lookup avoidance
+	# then a TTL-required repeat lookup
+  warn	dnslists =	rbl.test.ex/V4NET.11.12.14
+	dnslists =	rbl.test.ex/V4NET.11.12.14
+	delay =		4s
+	dnslists =	rbl.test.ex/V4NET.11.12.14
+  accept
+
+check_sndr:
+	# Do not care about result, looking at debug output
+	# expect an original lookup, a cached lookup avoidance
+	# then a TTL-required repeat lookup
+  warn	sender_domains = dnsdb;a=$sender_address_domain
+	sender_domains = dnsdb;a=$sender_address_domain
+	delay =		4s
+	sender_domains = dnsdb;a=$sender_address_domain
+  accept
 
 
 # ----- Routers -----
 
 begin routers
 
+r0:
+  driver = accept
+  senders = a@shorthost.test.ex
+  transport = remote_delivery
+
 r1:
   driver = accept
   domains = dnsdb;$domain
@@ -42,6 +70,11 @@ local_delivery:
   file = DIR/test-mail/$local_part
   user = CALLER
 
+remote_delivery:
+  driver = smtp
+  hosts = 127.0.0.1
+  allow_localhost
+  port = PORT_D
 
 # ----- Retry -----