tidying

[exim.git] / test / confs / 4201

diff --git a/test/confs/4201 b/test/confs/4201
index b34c7c1f9ff9f5c2aa7e14cf218cb67908709235..376cea5bd2840e62f17101576d1760f9165d9f68 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -3,13 +3,11 @@
 
 OPTION = *
 CONTROL =
 
 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 -----
 
 
 # ----- Main settings -----
 


@@ -28,6 +26,8 @@ queue_run_in_order
 
 smtputf8_advertise_hosts = OPTION
 
 
 smtputf8_advertise_hosts = OPTION
 

+SUB
+

 
 # ----- ACL -----
 
 
 # ----- ACL -----
 


@@ -39,12 +39,15 @@ begin acl
 check_recipient:
   accept hosts = :
   accept domains = +local_domains
 check_recipient:
   accept hosts = :
   accept domains = +local_domains

-        local_parts = ^user.*\$
+        local_parts = ^(xn--)?user.*\$

   deny   message = relay not permitted
 
 .else
 
 sub:
   deny   message = relay not permitted
 
 .else
 
 sub:

+.ifdef INSERT
+  require INSERT
+.endif

 .ifdef CONTROL
   require CONTROL
 .endif
 .ifdef CONTROL
   require CONTROL
 .endif


@@ -90,6 +93,11 @@ bounces:
   data = DIR/test-mail/$local_part
   file_transport = local_delivery
 
   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
 rmt:
   driver = manualroute
   domains = +local_domains


@@ -109,6 +117,7 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"
   headers_add = "X-body-linecount: $body_linecount\n\
                  X-message-linecount: $message_linecount\n\
                  X-received-count: $received_count"


@@ -116,5 +125,9 @@ local_delivery:
 
 rmt_smtp:
   driver = smtp
 
 rmt_smtp:
   driver = smtp

+  hosts_try_fastopen = :
+.ifdef STRICT
+  utf8_downconvert = STRICT
+.endif

 
 # End
 
 # End