Fix CVE-2016-1531

[exim.git] / test / confs / 4201

diff --git a/test/confs/4201 b/test/confs/4201
index aea46844794433c0c473181334315d752affc154..298eb847d80bb81c10d9df470216f6f11a2299ee 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -2,17 +2,22 @@
 # SMTPUTF8 handling
 
 OPTION = *
+CONTROL =
+INSERT =
+SUB =
 
 exim_path = EXIM_PATH
+keep_environment =
 host_lookup_order = bydns
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
+tls_advertise_hosts =
 
 # ----- 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 +32,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 -----