X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/6023a6ad2ac0294879b14127f62795095da573b5..d52a8ce8499fbb88f4670623df9f52d3e790292b:/test/confs/4201

diff --git a/test/confs/4201 b/test/confs/4201
index b34c7c1f9..a2c45a327 100644
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -3,13 +3,11 @@
 
 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 -----
 
@@ -28,6 +26,8 @@ queue_run_in_order
 
 smtputf8_advertise_hosts = OPTION
 
+SUB
+
 
 # ----- ACL -----
 
@@ -39,12 +39,15 @@ begin acl
 check_recipient:
   accept hosts = :
   accept domains = +local_domains
-	 local_parts = ^user.*\$
+	 local_parts = ^(xn--)?user.*\$
   deny   message = relay not permitted
 
 .else
 
 sub:
+.ifdef INSERT
+  require INSERT
+.endif
 .ifdef CONTROL
   require CONTROL
 .endif
@@ -90,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
@@ -108,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"
@@ -116,5 +124,9 @@ local_delivery:
 
 rmt_smtp:
   driver = smtp
+  hosts_try_fastopen =	:
+.ifdef STRICT
+  utf8_downconvert = STRICT
+.endif
 
 # End