Fix taint trap in parse_fix_phrase(). Bug 2617

[exim.git] / test / confs / 4201

diff --git a/test/confs/4201 b/test/confs/4201
index aea46844794433c0c473181334315d752affc154..a2c45a327d78a2e698d8fa368848cf3bc1e4b06e 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -2,17 +2,16 @@
 # SMTPUTF8 handling
 
 OPTION = *
+CONTROL =
+INSERT =
+SUB =
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
-domainlist local_domains = test.ex
+domainlist local_domains = test.ex : cname
 
 acl_smtp_rcpt = check_recipient
 acl_not_smtp = non_smtp
@@ -27,25 +26,42 @@ queue_run_in_order
 
 smtputf8_advertise_hosts = OPTION
 
+SUB
+
 
 # ----- ACL -----
 
 begin acl
 
-check_recipient:
 
-.ifndef SERVER
-  accept domains = *
-.endif
+.ifdef SERVER
+
+check_recipient:
   accept hosts = :
   accept domains = +local_domains
+        local_parts = ^(xn--)?user.*\$
   deny   message = relay not permitted
 
-.ifndef SERVER
+.else
+
+sub:
+.ifdef INSERT
+  require INSERT
+.endif
+.ifdef CONTROL
+  require CONTROL
+.endif
+  accept
+
+check_recipient:
+  accept domains = *
+        acl = sub
+
 non_smtp:
   accept senders = :
         control = queue_only
   accept
+
 .endif
 
 # ----- Routers -----
@@ -77,6 +93,11 @@ bounces:
   data = DIR/test-mail/$local_part
   file_transport = local_delivery
 
+redir:
+  driver = redirect
+  local_parts = ^z
+  data  =      ${substr_1:$local_part}@$domain
+
 rmt:
   driver = manualroute
   domains = +local_domains
@@ -95,7 +116,7 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
@@ -103,5 +124,9 @@ local_delivery:
 
 rmt_smtp:
   driver = smtp
+  hosts_try_fastopen = :
+.ifdef STRICT
+  utf8_downconvert = STRICT
+.endif
 
 # End