Taint: mark more command-line arguments

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

diff --git a/test/confs/4201 b/test/confs/4201
index 298eb847d80bb81c10d9df470216f6f11a2299ee..a2c45a327d78a2e698d8fa368848cf3bc1e4b06e 100644 (file)
--- a/test/confs/4201
+++ b/test/confs/4201
@@ -6,14 +6,8 @@ CONTROL =
 INSERT =
 SUB =
 
 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 =
+.include DIR/aux-var/std_conf_prefix
+

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


@@ -99,6 +93,11 @@ bounces:
   data = DIR/test-mail/$local_part
   file_transport = local_delivery
 
   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


@@ -117,7 +116,7 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
   user = CALLER
   delivery_date_add
   envelope_to_add

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   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"


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

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

 
 # End
 
 # End