X-Git-Url: https://git.exim.org/users/heiko/exim.git/blobdiff_plain/250b68713b5810a824bb14337b98737b6b81bf53..968178ac56100bcd7418b2dfc7e9224f977bb039:/test/confs/4201?ds=sidebyside

diff --git a/test/confs/4201 b/test/confs/4201
index 36e38bcd5..298eb847d 100644
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -2,21 +2,28 @@
 # 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
+
 trusted_users = CALLER
-log_selector = +received_recipients
+log_selector = +received_recipients +sender_on_delivery
 
 .ifdef SERVER
 queue_only
@@ -25,20 +32,44 @@ 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
 
+.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 -----
 
 begin routers
@@ -50,12 +81,24 @@ fail_remote_domains:
   domains = ! +local_domains
   data = :fail: unrouteable mail domain "$domain"
 
+bounces:
+  driver = redirect
+  condition = ${if eq {} {$sender_address}}
+  data = DIR/test-mail/$local_part
+  file_transport = local_delivery
+
 localuser:
   driver = redirect
   data = :blackhole:
 
 .else
 
+bounces:
+  driver = redirect
+  domains = *.local
+  data = DIR/test-mail/$local_part
+  file_transport = local_delivery
+
 rmt:
   driver = manualroute
   domains = +local_domains
@@ -63,10 +106,6 @@ rmt:
   transport = rmt_smtp
   self = send
 
-hole:
-  driver = redirect
-  data = :blackhole:
-
 .endif
 
 # ----- Transports -----
@@ -75,6 +114,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
+  user = CALLER
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part