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

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

diff --git a/test/confs/0023 b/test/confs/0023
index 2e5e15cb246cc0b70e4c2294b737a7496e348d67..c72c453a22b6a388fbd87b8580b87fd8123d856b 100644 (file)
--- a/test/confs/0023
+++ b/test/confs/0023
@@ -2,16 +2,14 @@
 
 LOG_SELECTOR=
 
 
 LOG_SELECTOR=
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 

+disable_ipv6 = true
+

 addresslist ok_senders = ok@ok.ok
 
 domainlist local_domains = test.ex : *.test.ex
 addresslist ok_senders = ok@ok.ok
 
 domainlist local_domains = test.ex : *.test.ex


@@ -98,6 +96,10 @@ acl_9_9_9:
 acl_V4NET_0_0:
   require verify = reverse_host_lookup
   accept
 acl_V4NET_0_0:
   require verify = reverse_host_lookup
   accept

+acl_V4NET_99_99:
+  accept  local_parts = defer_ok
+         verify = reverse_host_lookup/defer_ok
+  accept  verify = reverse_host_lookup

 
 acl_V4NET_11_12:
   deny    message = host in DNS list $dnslist_domain: $dnslist_text
 
 acl_V4NET_11_12:
   deny    message = host in DNS list $dnslist_domain: $dnslist_text


@@ -230,7 +232,7 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   user = CALLER
 
 t2:
   user = CALLER
 
 t2: