Debug: indentation

[exim.git] / test / confs / 4201

diff --git a/test/confs/4201 b/test/confs/4201
index 36e38bcd582da6c02a7b805191ea6cf1bc543872..376cea5bd2840e62f17101576d1760f9165d9f68 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -2,21 +2,22 @@
 # SMTPUTF8 handling
 
 OPTION = *
 # SMTPUTF8 handling
 
 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 -----
 

-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
 
 .ifdef SERVER
 queue_only


@@ -25,20 +26,44 @@ queue_run_in_order
 
 smtputf8_advertise_hosts = OPTION
 
 
 smtputf8_advertise_hosts = OPTION
 

+SUB
+

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

-check_recipient:

 
 

-.ifndef SERVER
-  accept domains = *
-.endif
+.ifdef SERVER
+
+check_recipient:

   accept hosts = :
   accept domains = +local_domains
   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


@@ -50,12 +75,29 @@ 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
+
+redir:
+  driver = redirect
+  local_parts = ^z
+  data  =      ${substr_1:$local_part}@$domain
+

 rmt:
   driver = manualroute
   domains = +local_domains
 rmt:
   driver = manualroute
   domains = +local_domains


@@ -63,10 +105,6 @@ rmt:
   transport = rmt_smtp
   self = send
 
   transport = rmt_smtp
   self = send
 

-hole:
-  driver = redirect
-  data = :blackhole:
-

 .endif
 
 # ----- Transports -----
 .endif
 
 # ----- Transports -----


@@ -75,9 +113,11 @@ 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

+  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"


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

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

 
 # End
 
 # End