Set mainlog_name and rejectlog_name unconditionally.

[exim.git] / test / confs / 0015

diff --git a/test/confs/0015 b/test/confs/0015
index dbbdfd059943ecfc444acc5e18a4243b1a6199fa..b1472da06cc78136a9c9d0cad077d5390264c21c 100644 (file)
--- a/test/confs/0015
+++ b/test/confs/0015
@@ -33,7 +33,7 @@ userforward:
   allow_filter
   local_parts = userx
   user = CALLER
   allow_filter
   local_parts = userx
   user = CALLER

-  file = DIR/aux-fixed/0015.filter.$local_part
+  file = DIR/aux-fixed/0015.filter.${bless:$local_part}

   local_part_prefix = *+
   local_part_prefix_optional
   pipe_transport = address_pipe
   local_part_prefix = *+
   local_part_prefix_optional
   pipe_transport = address_pipe


@@ -80,21 +80,23 @@ 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}

   return_path_add
   headers_add = X-local_part: $local_part\n\
   return_path_add
   headers_add = X-local_part: $local_part\n\

-                X-local_part_prefix: $local_part_prefix
+                X-local_part_prefix: $local_part_prefix\n\
+                X-local_part_prefix_v: $local_part_prefix_v

 
 local_delivery_b:
   driver = appendfile
   user = CALLER
   delivery_date_add
   envelope_to_add
 
 local_delivery_b:
   driver = appendfile
   user = CALLER
   delivery_date_add
   envelope_to_add

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

   return_path_add
   use_bsmtp
   headers_add = X-local_part: $local_part\n\
   return_path_add
   use_bsmtp
   headers_add = X-local_part: $local_part\n\

-                X-local_part_prefix: $local_part_prefix
+                X-local_part_prefix: $local_part_prefix\n\
+                X-local_part_prefix_v: $local_part_prefix_v

 
 delivery_s:
   driver = smtp
 
 delivery_s:
   driver = smtp