Merge branch 'master' into 4.next

[exim.git] / test / confs / 4201

diff --git a/test/confs/4201 b/test/confs/4201
index b34c7c1f9ff9f5c2aa7e14cf218cb67908709235..980f1d8fa8538ff595701dc20e2615d7925316fb 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -3,6 +3,8 @@
 
 OPTION = *
 CONTROL =
 
 OPTION = *
 CONTROL =

+INSERT =
+SUB =

 
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 
 exim_path = EXIM_PATH
 host_lookup_order = bydns


@@ -10,6 +12,7 @@ spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+tls_advertise_hosts =

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


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

+SUB
+

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


@@ -39,12 +44,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