refactor

[exim.git] / test / confs / 0016

diff --git a/test/confs/0016 b/test/confs/0016
index dcc005f0b3f81c7dba6d091fc5a20dbc1e71bfca..f8cbb7cbb74f4e64108d0b6b85d5a81c0c04f208 100644 (file)
--- a/test/confs/0016
+++ b/test/confs/0016
@@ -17,7 +17,7 @@ userforward:
   allow_filter
   user = CALLER
   local_parts = userx : CALLER
   allow_filter
   user = CALLER
   local_parts = userx : CALLER

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

   local_part_suffix = +*
   local_part_suffix_optional
   reply_transport = address_reply
   local_part_suffix = +*
   local_part_suffix_optional
   reply_transport = address_reply


@@ -39,8 +39,12 @@ local_delivery:
   user = CALLER
   delivery_date_add
   envelope_to_add
   user = CALLER
   delivery_date_add
   envelope_to_add

-  file = DIR/test-mail/${bless:$local_part}
+  headers_add = X-local_part: $local_part\n\
+               X-local_part_suffix: $local_part_suffix\n\
+               X-local_part_suffix_v: $local_part_suffix_v

   return_path_add
   return_path_add

+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail

 
 address_reply:
   driver = autoreply
 
 address_reply:
   driver = autoreply