DKIM: support oversigning. Bugs 1309, 1310

[users/jgh/exim.git] / test / confs / 4201

diff --git a/test/confs/4201 b/test/confs/4201
index 3b87cd5fcf93726db3cdc4a3f14dba2cc191f72c..980f1d8fa8538ff595701dc20e2615d7925316fb 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -1,4 +1,10 @@
 # Exim test configuration 4201
 # Exim test configuration 4201

+# SMTPUTF8 handling
+
+OPTION = *
+CONTROL =
+INSERT =
+SUB =

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


@@ -6,32 +12,63 @@ 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 -----
 

-domainlist local_domains = test.ex
+domainlist local_domains = test.ex : cname

 
 acl_smtp_rcpt = check_recipient
 
 acl_smtp_rcpt = check_recipient

+acl_not_smtp = non_smtp
+

 trusted_users = CALLER
 trusted_users = CALLER

-log_selector = +received_recipients
+log_selector = +received_recipients +sender_on_delivery

 
 .ifdef SERVER
 queue_only
 queue_run_in_order
 .endif
 
 
 .ifdef SERVER
 queue_only
 queue_run_in_order
 .endif
 

-smtputf8_advertise_hosts = *
+smtputf8_advertise_hosts = OPTION
+
+SUB

 
 
 # ----- ACL -----
 
 begin acl
 
 
 
 # ----- ACL -----
 
 begin acl
 

+
+.ifdef SERVER
+

 check_recipient:
   accept hosts = :
   accept domains = +local_domains
 check_recipient:
   accept hosts = :
   accept domains = +local_domains

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

   deny   message = relay not permitted
 
   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
 # ----- Routers -----
 
 begin routers


@@ -43,14 +80,27 @@ fail_remote_domains:
   domains = ! +local_domains
   data = :fail: unrouteable mail domain "$domain"
 
   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
 
 localuser:
   driver = redirect
   data = :blackhole:
 
 .else
 

+bounces:
+  driver = redirect
+  domains = *.local
+  data = DIR/test-mail/$local_part
+  file_transport = local_delivery
+

 rmt:
   driver = manualroute
 rmt:
   driver = manualroute

+  domains = +local_domains

   route_data = <;[127.0.0.1]:PORT_D
   transport = rmt_smtp
   self = send
   route_data = <;[127.0.0.1]:PORT_D
   transport = rmt_smtp
   self = send


@@ -63,6 +113,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

+  user = CALLER

   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part