Taint: fix ACL "spam" condition, to permit tainted name arguments.

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

diff --git a/test/confs/0069 b/test/confs/0069
index 469c393305f84aafb22e607266ebf26e4c10d666..9ad368630249a405179e6364d7a363d740611f95 100644 (file)
--- a/test/confs/0069
+++ b/test/confs/0069
@@ -2,17 +2,14 @@
 
 LOG_SELECTOR=
 
-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 -----
 
+disable_ipv6 = true
+
 domainlist local_domains = test.ex : myhost.ex
 
 acl_smtp_rcpt = check_recipient$local_part
@@ -30,11 +27,25 @@ check_recipientx:
   deny    message = relay not permitted
 
 check_recipienty:
-  accept  hosts = non.existent.invalid : V4NET.0.0.13
+  accept  hosts = not-exist.test.ex : V4NET.0.0.13
   deny    message = "Denied"
 
 check_recipientz:
-  accept  hosts = +ignore_unknown : non.existent.invalid : V4NET.0.0.13
+  accept  hosts = +ignore_unknown : not-exist.test.ex : V4NET.0.0.13
+  deny    message = "Denied"
+
+check_recipienta:
+  accept  hosts = :
+  deny    hosts = +include_defer : test.again.dns
+  accept  domains = +local_domains
+  deny    message = relay not permitted
+
+check_recipientb:
+  accept  hosts = test.again.dns : V4NET.0.0.13
+  deny    message = "Denied"
+
+check_recipientc:
+  accept  hosts = +ignore_defer : test.again.dns : V4NET.0.0.13
   deny    message = "Denied"
 
 # End