diff options
Diffstat (limited to 'test/confs')
315 files changed, 398 insertions, 358 deletions
diff --git a/test/confs/0001 b/test/confs/0001 index 4dfd09aea..c8ad6f43f 100644 --- a/test/confs/0001 +++ b/test/confs/0001 @@ -517,7 +517,7 @@ appendfile: directory_mode = 0700 envelope_to_add escape_string = xyz - file = /home/$local_part/inbox + file = /home/${bless:$local_part}/inbox file_format = "From : appendfile" no_file_must_exist group = MAILGROUP diff --git a/test/confs/0006 b/test/confs/0006 index c01a2fe2e..b83e897ca 100644 --- a/test/confs/0006 +++ b/test/confs/0006 @@ -35,7 +35,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add headers_add = \nMessage Headers:\n$message_headers\n\ \nRaw Message Headers:\n$message_headers_raw\n diff --git a/test/confs/0008 b/test/confs/0008 index 91db09111..396718f98 100644 --- a/test/confs/0008 +++ b/test/confs/0008 @@ -27,7 +27,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add # End diff --git a/test/confs/0009 b/test/confs/0009 index 422fe3d1d..3ca2feb7a 100644 --- a/test/confs/0009 +++ b/test/confs/0009 @@ -27,7 +27,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add # End diff --git a/test/confs/0010 b/test/confs/0010 index 39e3fcf88..0216aae14 100644 --- a/test/confs/0010 +++ b/test/confs/0010 @@ -27,7 +27,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add diff --git a/test/confs/0011 b/test/confs/0011 index f8c04763d..e39d59563 100644 --- a/test/confs/0011 +++ b/test/confs/0011 @@ -27,7 +27,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add diff --git a/test/confs/0012 b/test/confs/0012 index b367e8992..76f5bc4ac 100644 --- a/test/confs/0012 +++ b/test/confs/0012 @@ -30,7 +30,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add diff --git a/test/confs/0014 b/test/confs/0014 index 1fdd92d0c..23abbb240 100644 --- a/test/confs/0014 +++ b/test/confs/0014 @@ -94,7 +94,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} message_suffix = user = CALLER diff --git a/test/confs/0015 b/test/confs/0015 index dbbdfd059..8c62e2e08 100644 --- a/test/confs/0015 +++ b/test/confs/0015 @@ -33,7 +33,7 @@ userforward: 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 @@ -80,7 +80,7 @@ local_delivery: 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\ X-local_part_prefix: $local_part_prefix @@ -90,7 +90,7 @@ local_delivery_b: 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\ diff --git a/test/confs/0016 b/test/confs/0016 index 4260c88be..dcc005f0b 100644 --- a/test/confs/0016 +++ b/test/confs/0016 @@ -17,7 +17,7 @@ userforward: allow_filter user = CALLER local_parts = userx : CALLER - file = DIR/aux-fixed/0016.filter.$local_part + file = DIR/aux-fixed/0016.filter.${bless:$local_part} local_part_suffix = +* local_part_suffix_optional reply_transport = address_reply @@ -39,7 +39,7 @@ local_delivery: user = CALLER delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add address_reply: diff --git a/test/confs/0021 b/test/confs/0021 index cb057386e..0150839b4 100644 --- a/test/confs/0021 +++ b/test/confs/0021 @@ -84,7 +84,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0022 b/test/confs/0022 index bd04442aa..2228b2807 100644 --- a/test/confs/0022 +++ b/test/confs/0022 @@ -90,7 +90,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0023 b/test/confs/0023 index 2481976ce..c72c453a2 100644 --- a/test/confs/0023 +++ b/test/confs/0023 @@ -232,7 +232,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0024 b/test/confs/0024 index 3dbbc2c25..30e5636e9 100644 --- a/test/confs/0024 +++ b/test/confs/0024 @@ -77,7 +77,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0025 b/test/confs/0025 index 3ecc5dd68..f2d987e13 100644 --- a/test/confs/0025 +++ b/test/confs/0025 @@ -52,7 +52,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0026 b/test/confs/0026 index 07fa40976..cc0c51c9b 100644 --- a/test/confs/0026 +++ b/test/confs/0026 @@ -54,7 +54,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0027 b/test/confs/0027 index 9c775bd5d..19bdaa0b6 100644 --- a/test/confs/0027 +++ b/test/confs/0027 @@ -70,7 +70,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0028 b/test/confs/0028 index 149d8eda8..caebac0ce 100644 --- a/test/confs/0028 +++ b/test/confs/0028 @@ -54,7 +54,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0031 b/test/confs/0031 index e3f0360fc..8760be578 100644 --- a/test/confs/0031 +++ b/test/confs/0031 @@ -29,7 +29,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add # End diff --git a/test/confs/0032 b/test/confs/0032 index caf5edb28..644404d24 100644 --- a/test/confs/0032 +++ b/test/confs/0032 @@ -33,7 +33,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add smtp: diff --git a/test/confs/0036 b/test/confs/0036 index ded64879f..6d02a44cd 100644 --- a/test/confs/0036 +++ b/test/confs/0036 @@ -37,7 +37,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER send_to_server: diff --git a/test/confs/0037 b/test/confs/0037 index 8ba94ded1..06a38564d 100644 --- a/test/confs/0037 +++ b/test/confs/0037 @@ -85,7 +85,7 @@ appendfile: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0040 b/test/confs/0040 index 35453a0dd..30a3de234 100644 --- a/test/confs/0040 +++ b/test/confs/0040 @@ -27,7 +27,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "X-interface: $interface_address" return_path_add user = CALLER diff --git a/test/confs/0041 b/test/confs/0041 index f7fa61ed8..0d601a892 100644 --- a/test/confs/0041 +++ b/test/confs/0041 @@ -52,7 +52,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0042 b/test/confs/0042 index 14c8a9635..46229f59f 100644 --- a/test/confs/0042 +++ b/test/confs/0042 @@ -38,7 +38,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0043 b/test/confs/0043 index 0bf3547c7..91d58f338 100644 --- a/test/confs/0043 +++ b/test/confs/0043 @@ -56,7 +56,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0044 b/test/confs/0044 index e4db43db0..c13a15817 100644 --- a/test/confs/0044 +++ b/test/confs/0044 @@ -47,7 +47,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0046 b/test/confs/0046 index 9fff3b91b..15e8df80f 100644 --- a/test/confs/0046 +++ b/test/confs/0046 @@ -32,7 +32,7 @@ begin transports local_delivery: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "X-size: $message_size\n\ X-body-size: $message_body_size\n\ X-body: $message_body\n\ diff --git a/test/confs/0048 b/test/confs/0048 index 9c2d4428f..d11a120f1 100644 --- a/test/confs/0048 +++ b/test/confs/0048 @@ -42,7 +42,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add address_pipe: diff --git a/test/confs/0049 b/test/confs/0049 index a00dde1f5..fd2574ea8 100644 --- a/test/confs/0049 +++ b/test/confs/0049 @@ -34,7 +34,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0050 b/test/confs/0050 index 32a822a9b..32c414aa1 100644 --- a/test/confs/0050 +++ b/test/confs/0050 @@ -37,7 +37,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0051 b/test/confs/0051 index 2fde9e557..a14fc3ddc 100644 --- a/test/confs/0051 +++ b/test/confs/0051 @@ -40,7 +40,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0052 b/test/confs/0052 index 2af555cca..426e7ed98 100644 --- a/test/confs/0052 +++ b/test/confs/0052 @@ -33,7 +33,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add diff --git a/test/confs/0053 b/test/confs/0053 index 04263a59f..4d279d0ab 100644 --- a/test/confs/0053 +++ b/test/confs/0053 @@ -32,7 +32,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0055 b/test/confs/0055 index 6cc9b7c18..ed6e60878 100644 --- a/test/confs/0055 +++ b/test/confs/0055 @@ -46,7 +46,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0072 b/test/confs/0072 index 9bb73984d..e1e997b9a 100644 --- a/test/confs/0072 +++ b/test/confs/0072 @@ -53,7 +53,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add diff --git a/test/confs/0073 b/test/confs/0073 index da716efb6..678825673 100644 --- a/test/confs/0073 +++ b/test/confs/0073 @@ -40,7 +40,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add diff --git a/test/confs/0074 b/test/confs/0074 index 3102206b0..20227d416 100644 --- a/test/confs/0074 +++ b/test/confs/0074 @@ -41,7 +41,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0075 b/test/confs/0075 index 8b8c77ca6..b07ffbdfd 100644 --- a/test/confs/0075 +++ b/test/confs/0075 @@ -26,7 +26,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/subdir/$local_part + file = DIR/test-mail/subdir/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0076 b/test/confs/0076 index 1415280f9..8e9c08f80 100644 --- a/test/confs/0076 +++ b/test/confs/0076 @@ -27,7 +27,7 @@ local_delivery: no_create_directory delivery_date_add envelope_to_add - file = DIR/test-mail/subdir/$local_part + file = DIR/test-mail/subdir/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0079 b/test/confs/0079 index 25ef65879..a7a412ffa 100644 --- a/test/confs/0079 +++ b/test/confs/0079 @@ -69,7 +69,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0080 b/test/confs/0080 index fbe026c26..a0f578f61 100644 --- a/test/confs/0080 +++ b/test/confs/0080 @@ -50,7 +50,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0081 b/test/confs/0081 index f403728c3..2e020e01d 100644 --- a/test/confs/0081 +++ b/test/confs/0081 @@ -28,7 +28,7 @@ local_delivery: debug_print = ">$h_X-one:<\n" delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0082 b/test/confs/0082 index 29ff8d15c..fca3e7b0d 100644 --- a/test/confs/0082 +++ b/test/confs/0082 @@ -26,7 +26,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "Proto: $received_protocol" return_path_add user = CALLER diff --git a/test/confs/0083 b/test/confs/0083 index fcae1f5d1..4ab79fce4 100644 --- a/test/confs/0083 +++ b/test/confs/0083 @@ -26,7 +26,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "Proto: $received_protocol" return_path_add user = CALLER diff --git a/test/confs/0084 b/test/confs/0084 index 94e386e02..bbee05f04 100644 --- a/test/confs/0084 +++ b/test/confs/0084 @@ -20,7 +20,7 @@ smart: forward: driver = redirect - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} redirect_router = localuser require_files = DIR/aux-fixed/TESTNUM.$local_part retry_use_local_part diff --git a/test/confs/0090 b/test/confs/0090 index 907d27544..f5dc6f291 100644 --- a/test/confs/0090 +++ b/test/confs/0090 @@ -30,7 +30,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER respond: diff --git a/test/confs/0094 b/test/confs/0094 index 04c9d8078..07698b5c0 100644 --- a/test/confs/0094 +++ b/test/confs/0094 @@ -42,7 +42,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = host_lookup_failed: $host_lookup_failed\n\ host_lookup_deferred: $host_lookup_deferred user = CALLER diff --git a/test/confs/0095 b/test/confs/0095 index c20b06d7c..b1201f870 100644 --- a/test/confs/0095 +++ b/test/confs/0095 @@ -39,7 +39,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} quota = $h_quota quota_warn_threshold = $h_threshold QWM @@ -47,14 +47,14 @@ appendfile: appendfile2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} quota = $h_quota quota_warn_threshold = $h_threshold user = CALLER appendfile3: driver = appendfile - file = DIR/test-mail/$local_part${if eq{$sender_address}{}{.bounce}} + file = DIR/test-mail/${bless:$local_part}${if eq{$sender_address}{}{.bounce}} quota_warn_threshold = $h_threshold user = CALLER headers_add = X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa diff --git a/test/confs/0096 b/test/confs/0096 index ff5f5cebc..1eb519417 100644 --- a/test/confs/0096 +++ b/test/confs/0096 @@ -29,7 +29,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0097 b/test/confs/0097 index 0841952bf..495349d3f 100644 --- a/test/confs/0097 +++ b/test/confs/0097 @@ -29,7 +29,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "${if def:h_tadd: {Added: by transport}}" headers_remove = "${if def::h_tadd:: {tadd}}" return_path_add diff --git a/test/confs/0098 b/test/confs/0098 index cce115f12..e16b25eaa 100644 --- a/test/confs/0098 +++ b/test/confs/0098 @@ -84,7 +84,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0100 b/test/confs/0100 index 143ff4cfe..afe04a4c1 100644 --- a/test/confs/0100 +++ b/test/confs/0100 @@ -84,7 +84,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add current_directory = / user = CALLER @@ -93,7 +93,7 @@ hackfree_local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} check_string = return_path_add user = CALLER @@ -105,7 +105,7 @@ bsmtp_local_delivery: use_bsmtp delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER current_directory = / @@ -116,7 +116,7 @@ bsmtp_local_delivery_filtered: use_bsmtp delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat" user = CALLER @@ -136,7 +136,7 @@ filtered_local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add transport_filter = /bin/sh -c "echo 'X-Filtered: just checking'; cat" current_directory = / @@ -146,7 +146,7 @@ mmdf_local_delivery: driver = appendfile check_string = "\1\1\1\1\n" escape_string = "\1\1\1\1 \n" - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} message_prefix = "\1\1\1\1\n" message_suffix = "\1\1\1\1\n" user = CALLER diff --git a/test/confs/0102 b/test/confs/0102 index 2497fd032..30b1496ac 100644 --- a/test/confs/0102 +++ b/test/confs/0102 @@ -38,7 +38,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} file_format = "From : local_delivery :\ MAIL : bsmtp_local_delivery :\ \1\1\1\1\n : mmdf_local_delivery :\ @@ -52,7 +52,7 @@ bsmtp_local_delivery: use_bsmtp delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER @@ -60,7 +60,7 @@ mmdf_local_delivery: driver = appendfile check_string = "\1\1\1\1\n" escape_string = "\1\1\1\1 \n" - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} message_prefix = "\1\1\1\1\n" message_suffix = "\1\1\1\1\n" user = CALLER diff --git a/test/confs/0103 b/test/confs/0103 index 9a136c7bc..547109ab5 100644 --- a/test/confs/0103 +++ b/test/confs/0103 @@ -53,7 +53,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0104 b/test/confs/0104 index de0889adb..3cbebc856 100644 --- a/test/confs/0104 +++ b/test/confs/0104 @@ -44,7 +44,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0105 b/test/confs/0105 index 1b954f460..851f12cc1 100644 --- a/test/confs/0105 +++ b/test/confs/0105 @@ -42,7 +42,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0107 b/test/confs/0107 index 9bbb7e7a3..5f6a80e87 100644 --- a/test/confs/0107 +++ b/test/confs/0107 @@ -28,7 +28,7 @@ appendfile: create_file = belowhome file = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.filelist}\ {${if match{$value}{^/}{}{DIR/}}$value}\ - {DIR/test-mail/$local_part}} + {DIR/test-mail/${bless:$local_part}}} user = CALLER # ----- Retry ----- diff --git a/test/confs/0110 b/test/confs/0110 index 361c12fb4..e4716f625 100644 --- a/test/confs/0110 +++ b/test/confs/0110 @@ -44,7 +44,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0111 b/test/confs/0111 index 61fc9a887..3b4386b70 100644 --- a/test/confs/0111 +++ b/test/confs/0111 @@ -43,7 +43,7 @@ begin transports appendfile: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0113 b/test/confs/0113 index 1fd61009f..2c0c573a3 100644 --- a/test/confs/0113 +++ b/test/confs/0113 @@ -45,7 +45,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0116 b/test/confs/0116 index 313d32c63..6916642e1 100644 --- a/test/confs/0116 +++ b/test/confs/0116 @@ -51,7 +51,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER headers_add = Added: $address_data diff --git a/test/confs/0118 b/test/confs/0118 index cf8838f32..1f741cc0a 100644 --- a/test/confs/0118 +++ b/test/confs/0118 @@ -41,7 +41,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0121 b/test/confs/0121 index ca2d338a1..550971e40 100644 --- a/test/confs/0121 +++ b/test/confs/0121 @@ -59,7 +59,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0127 b/test/confs/0127 index 1906bb430..83dd03198 100644 --- a/test/confs/0127 +++ b/test/confs/0127 @@ -37,7 +37,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0128 b/test/confs/0128 index 9acfb5e9d..e4f78dca2 100644 --- a/test/confs/0128 +++ b/test/confs/0128 @@ -41,7 +41,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0131 b/test/confs/0131 index c55813e77..c3df9a89e 100644 --- a/test/confs/0131 +++ b/test/confs/0131 @@ -25,7 +25,7 @@ forward: driver = redirect allow_filter no_check_local_user - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} retry_use_local_part user = CALLER address_data = $address_data-forward @@ -43,7 +43,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER headers_add = Address-Data: >$address_data< diff --git a/test/confs/0133 b/test/confs/0133 index bc4e6283f..2c9cdb88e 100644 --- a/test/confs/0133 +++ b/test/confs/0133 @@ -42,7 +42,7 @@ begin transports appendfile: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0135 b/test/confs/0135 index 7fd5bdaa5..1318e025c 100644 --- a/test/confs/0135 +++ b/test/confs/0135 @@ -49,7 +49,7 @@ smtp: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} quota = 20 user = CALLER diff --git a/test/confs/0136 b/test/confs/0136 index efc73c58d..acc1003c9 100644 --- a/test/confs/0136 +++ b/test/confs/0136 @@ -63,7 +63,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0137 b/test/confs/0137 index 7c48d6234..faab263aa 100644 --- a/test/confs/0137 +++ b/test/confs/0137 @@ -30,14 +30,14 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} lock_interval = 1s lock_retries = 2 user = CALLER local_delivery_fcntl: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} lock_interval = 1s lock_retries = 2 no_use_lockfile @@ -45,7 +45,7 @@ local_delivery_fcntl: local_delivery_fcntl_blocking: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} lock_fcntl_timeout = 2s lock_interval = 1s lock_retries = 2 diff --git a/test/confs/0138 b/test/confs/0138 index 66539d6b0..01bdfaa62 100644 --- a/test/confs/0138 +++ b/test/confs/0138 @@ -54,7 +54,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0139 b/test/confs/0139 index eb3990c72..13a90df0a 100644 --- a/test/confs/0139 +++ b/test/confs/0139 @@ -80,7 +80,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0140 b/test/confs/0140 index 02567153c..5661c5df4 100644 --- a/test/confs/0140 +++ b/test/confs/0140 @@ -45,7 +45,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0142 b/test/confs/0142 index 748e76b8b..716ad5fa7 100644 --- a/test/confs/0142 +++ b/test/confs/0142 @@ -43,12 +43,12 @@ pipe: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER filtered_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} transport_filter = DIR/bin/fd -f user = CALLER diff --git a/test/confs/0149 b/test/confs/0149 index 60c742acf..8527d30fa 100644 --- a/test/confs/0149 +++ b/test/confs/0149 @@ -40,7 +40,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0150 b/test/confs/0150 index dd421a125..256080a50 100644 --- a/test/confs/0150 +++ b/test/confs/0150 @@ -25,7 +25,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0151 b/test/confs/0151 index d5d178654..0baf3450d 100644 --- a/test/confs/0151 +++ b/test/confs/0151 @@ -26,7 +26,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0152 b/test/confs/0152 index 7671d52ed..5d50c9f31 100644 --- a/test/confs/0152 +++ b/test/confs/0152 @@ -28,7 +28,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0153 b/test/confs/0153 index c16f88fe9..69e02ebcf 100644 --- a/test/confs/0153 +++ b/test/confs/0153 @@ -22,7 +22,7 @@ virtual: list: driver = redirect domains = list.test.ex - file = ${if exists{DIR/aux-fixed/TESTNUM.list.$local_part} \ + file = ${if exists{DIR/aux-fixed/TESTNUM.list.${bless:$local_part}} \ {DIR/aux-fixed/TESTNUM.list.$local_part}fail} no_more diff --git a/test/confs/0156 b/test/confs/0156 index d1faa7514..79dcde236 100644 --- a/test/confs/0156 +++ b/test/confs/0156 @@ -30,7 +30,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0158 b/test/confs/0158 index ccd261e56..8a5c00e07 100644 --- a/test/confs/0158 +++ b/test/confs/0158 @@ -28,7 +28,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = $local_part diff --git a/test/confs/0159 b/test/confs/0159 index e648d9304..7fcaf6063 100644 --- a/test/confs/0159 +++ b/test/confs/0159 @@ -28,7 +28,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0164 b/test/confs/0164 index 6d94efdfd..d80f383f5 100644 --- a/test/confs/0164 +++ b/test/confs/0164 @@ -29,7 +29,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER address_pipe: diff --git a/test/confs/0165 b/test/confs/0165 index 03e9a825e..48fe63bf1 100644 --- a/test/confs/0165 +++ b/test/confs/0165 @@ -29,7 +29,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER address_pipe: diff --git a/test/confs/0166 b/test/confs/0166 index 93489dc56..3158ac502 100644 --- a/test/confs/0166 +++ b/test/confs/0166 @@ -37,7 +37,7 @@ begin transports local_delivery: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER headers_add = X-tpt-hdr: 1 headers_add = ${if bool{false} {X-tpt-hdr: 2}} diff --git a/test/confs/0167 b/test/confs/0167 index a65b9ed65..a3e045f21 100644 --- a/test/confs/0167 +++ b/test/confs/0167 @@ -35,7 +35,7 @@ begin transports local_delivery: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path = ${if eq{$return_path}{trakill@test.ex}{}fail} return_path_add user = CALLER diff --git a/test/confs/0169 b/test/confs/0169 index beafec56d..ec8bf7957 100644 --- a/test/confs/0169 +++ b/test/confs/0169 @@ -23,7 +23,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} quota = $h_quota quota_warn_threshold = $h_threshold user = CALLER diff --git a/test/confs/0171 b/test/confs/0171 index fe4fc2c15..345a1813c 100644 --- a/test/confs/0171 +++ b/test/confs/0171 @@ -24,7 +24,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = home: HOME=$home user = CALLER diff --git a/test/confs/0172 b/test/confs/0172 index 9dcc42f81..7b335183e 100644 --- a/test/confs/0172 +++ b/test/confs/0172 @@ -28,7 +28,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0173 b/test/confs/0173 index bfddc71e8..dfe894ef8 100644 --- a/test/confs/0173 +++ b/test/confs/0173 @@ -29,7 +29,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER pipe: diff --git a/test/confs/0174 b/test/confs/0174 index 32a3bde5d..5498e2bee 100644 --- a/test/confs/0174 +++ b/test/confs/0174 @@ -52,7 +52,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER pipe: diff --git a/test/confs/0175 b/test/confs/0175 index 461c265ba..3f2cc8c96 100644 --- a/test/confs/0175 +++ b/test/confs/0175 @@ -62,7 +62,7 @@ smtp: appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0176 b/test/confs/0176 index 81d0b5ddf..d5c86caa5 100644 --- a/test/confs/0176 +++ b/test/confs/0176 @@ -26,7 +26,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0177 b/test/confs/0177 index 0b78d4e0c..ff780c145 100644 --- a/test/confs/0177 +++ b/test/confs/0177 @@ -65,7 +65,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER autoreply: diff --git a/test/confs/0178 b/test/confs/0178 index bdabf6afa..2554e0a6c 100644 --- a/test/confs/0178 +++ b/test/confs/0178 @@ -26,7 +26,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0182 b/test/confs/0182 index 17d60789c..c23722a3b 100644 --- a/test/confs/0182 +++ b/test/confs/0182 @@ -34,7 +34,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0185 b/test/confs/0185 index d9d20fc93..b8bf04d29 100644 --- a/test/confs/0185 +++ b/test/confs/0185 @@ -62,7 +62,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER autoreply: diff --git a/test/confs/0189 b/test/confs/0189 index 5d12465b3..4d63ddf84 100644 --- a/test/confs/0189 +++ b/test/confs/0189 @@ -25,7 +25,7 @@ begin transports local_delivery: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0192 b/test/confs/0192 index d7bd3c1b1..e19bd003e 100644 --- a/test/confs/0192 +++ b/test/confs/0192 @@ -23,7 +23,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} quota = 500 no_quota_is_inclusive user = CALLER diff --git a/test/confs/0193 b/test/confs/0193 index 4dbb06679..483d05062 100644 --- a/test/confs/0193 +++ b/test/confs/0193 @@ -34,7 +34,7 @@ local_delivery: driver = appendfile batch_max = 100 envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} message_size_limit = 50 user = CALLER diff --git a/test/confs/0194 b/test/confs/0194 index d813d9290..abeaafcf1 100644 --- a/test/confs/0194 +++ b/test/confs/0194 @@ -31,7 +31,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER pipe: diff --git a/test/confs/0195 b/test/confs/0195 index 2d51bebfa..16032445b 100644 --- a/test/confs/0195 +++ b/test/confs/0195 @@ -38,7 +38,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0196 b/test/confs/0196 index 38a839144..690996916 100644 --- a/test/confs/0196 +++ b/test/confs/0196 @@ -41,7 +41,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0202 b/test/confs/0202 index dc68127ae..92a2dce66 100644 --- a/test/confs/0202 +++ b/test/confs/0202 @@ -31,7 +31,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0204 b/test/confs/0204 index 138dbe0a1..688e0e98b 100644 --- a/test/confs/0204 +++ b/test/confs/0204 @@ -25,7 +25,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0205 b/test/confs/0205 index 069e85033..abc93e7ff 100644 --- a/test/confs/0205 +++ b/test/confs/0205 @@ -42,7 +42,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER headers_add = Address-Data: >$address_data< diff --git a/test/confs/0210 b/test/confs/0210 index 298ad7279..3e5661ccb 100644 --- a/test/confs/0210 +++ b/test/confs/0210 @@ -44,7 +44,7 @@ bsmtp_local_delivery: message_prefix = "HELO x.y.z\n" delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0211 b/test/confs/0211 index b1dae707c..f68b036be 100644 --- a/test/confs/0211 +++ b/test/confs/0211 @@ -57,7 +57,7 @@ smtp: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0212 b/test/confs/0212 index 39db8c800..8b8d74404 100644 --- a/test/confs/0212 +++ b/test/confs/0212 @@ -58,7 +58,7 @@ alias: forward: driver = redirect no_check_local_user - file = DIR/aux-fixed/TESTNUM.$local_part.forward + file = DIR/aux-fixed/TESTNUM.${bless:$local_part}.forward retry_use_local_part all: @@ -73,7 +73,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0220 b/test/confs/0220 index 36cf87223..8e5af4e58 100644 --- a/test/confs/0220 +++ b/test/confs/0220 @@ -26,7 +26,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0221 b/test/confs/0221 index f7855a678..4ac979c0d 100644 --- a/test/confs/0221 +++ b/test/confs/0221 @@ -26,7 +26,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0222 b/test/confs/0222 index 8f4a5b688..91f74538a 100644 --- a/test/confs/0222 +++ b/test/confs/0222 @@ -32,7 +32,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER autoreply: diff --git a/test/confs/0223 b/test/confs/0223 index e42df517e..56476a3d5 100644 --- a/test/confs/0223 +++ b/test/confs/0223 @@ -42,7 +42,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0224 b/test/confs/0224 index d1c425b47..ff77339c7 100644 --- a/test/confs/0224 +++ b/test/confs/0224 @@ -45,7 +45,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0225 b/test/confs/0225 index 0ed97b4ef..a778c2f6a 100644 --- a/test/confs/0225 +++ b/test/confs/0225 @@ -44,7 +44,7 @@ smtp: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0226 b/test/confs/0226 index 0b6eeff74..f5be03e9d 100644 --- a/test/confs/0226 +++ b/test/confs/0226 @@ -34,7 +34,7 @@ allowed: driver = redirect allow_defer caseful_local_part - data = $local_part + data = ${bless:$local_part} file_transport = address_file pipe_transport = address_pipe retry_use_local_part @@ -47,7 +47,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER address_file: diff --git a/test/confs/0230 b/test/confs/0230 index f77f52f69..08a67228e 100644 --- a/test/confs/0230 +++ b/test/confs/0230 @@ -57,7 +57,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = Port: $sender_host_port user = CALLER diff --git a/test/confs/0231 b/test/confs/0231 index 1eabae91a..67f21c0e1 100644 --- a/test/confs/0231 +++ b/test/confs/0231 @@ -51,13 +51,13 @@ begin transports local_delivery_rewrite: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_rewrite = a@test.ex a-rewrite@test.ex user = CALLER local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER smtp_rewrite: diff --git a/test/confs/0232 b/test/confs/0232 index 59e1ae918..11e4523ea 100644 --- a/test/confs/0232 +++ b/test/confs/0232 @@ -39,7 +39,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0233 b/test/confs/0233 index 77dcca3b2..054ab7d67 100644 --- a/test/confs/0233 +++ b/test/confs/0233 @@ -39,7 +39,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER address_reply: diff --git a/test/confs/0237 b/test/confs/0237 index be2f5abd2..8939dc75e 100644 --- a/test/confs/0237 +++ b/test/confs/0237 @@ -35,7 +35,7 @@ allowed: driver = redirect allow_defer caseful_local_part - data = $local_part + data = ${bless:$local_part} file_transport = address_file hide_child_in_errmsg pipe_transport = address_pipe @@ -49,7 +49,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER address_file: diff --git a/test/confs/0240 b/test/confs/0240 index bb4519ef8..62a192321 100644 --- a/test/confs/0240 +++ b/test/confs/0240 @@ -90,7 +90,7 @@ begin transports local: driver = appendfile directory_mode = 3777 - file = DIR/test-mail/subdir/$local_part + file = DIR/test-mail/subdir/${bless:$local_part} user = CALLER diff --git a/test/confs/0241 b/test/confs/0241 index 644ed6b1f..944c517ea 100644 --- a/test/confs/0241 +++ b/test/confs/0241 @@ -37,7 +37,7 @@ begin transports local: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER address_reply: diff --git a/test/confs/0243 b/test/confs/0243 index 7396045ba..5a2f50136 100644 --- a/test/confs/0243 +++ b/test/confs/0243 @@ -59,7 +59,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER address_file: diff --git a/test/confs/0246 b/test/confs/0246 index fb959527d..fe62bfddf 100644 --- a/test/confs/0246 +++ b/test/confs/0246 @@ -35,7 +35,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0253 b/test/confs/0253 index 40ede04ea..5713106ac 100644 --- a/test/confs/0253 +++ b/test/confs/0253 @@ -42,7 +42,7 @@ begin transports t0: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t1: diff --git a/test/confs/0256 b/test/confs/0256 index c5d5d4b4e..e48c69648 100644 --- a/test/confs/0256 +++ b/test/confs/0256 @@ -30,7 +30,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0258 b/test/confs/0258 index 720cc4073..25de1af29 100644 --- a/test/confs/0258 +++ b/test/confs/0258 @@ -24,7 +24,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0260 b/test/confs/0260 index 6366cd0ad..257ea82da 100644 --- a/test/confs/0260 +++ b/test/confs/0260 @@ -14,7 +14,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER bad_return: @@ -30,7 +30,7 @@ bad_uid: exp_fail: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER home_directory = ${if rhubarb diff --git a/test/confs/0264 b/test/confs/0264 index 7c0a066e9..9e16d1db6 100644 --- a/test/confs/0264 +++ b/test/confs/0264 @@ -15,7 +15,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER quota = ${if eq{$local_part}{userx}{3}{10000}} @@ -24,7 +24,7 @@ local_delivery: local_delivery2: driver = appendfile retry_use_local_part = false - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER quota = 3 current_directory = / diff --git a/test/confs/0266 b/test/confs/0266 index d1e944dc2..42ea1b1f6 100644 --- a/test/confs/0266 +++ b/test/confs/0266 @@ -15,7 +15,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER envelope_to_add return_path_add @@ -29,14 +29,14 @@ r1: skip_syntax_errors local_parts = ^list syntax_errors_to = postmaster@test.ex - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} r1a: driver = redirect skip_syntax_errors local_parts = ^nmlist syntax_errors_to = postmaster@test.ex - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} no_more r2: @@ -46,7 +46,7 @@ r2: syntax_errors_to = postmaster@test.ex syntax_errors_text = "There's an error in your filter file.\n\ The file has been ignored." - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} allow_filter router_home_directory = DIR user = CALLER diff --git a/test/confs/0267 b/test/confs/0267 index bb134441b..e99d29f71 100644 --- a/test/confs/0267 +++ b/test/confs/0267 @@ -14,7 +14,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # ----- Routers ----- diff --git a/test/confs/0270 b/test/confs/0270 index 86f81d837..e09ff0e76 100644 --- a/test/confs/0270 +++ b/test/confs/0270 @@ -15,7 +15,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER envelope_to_add return_path_add @@ -29,14 +29,14 @@ r1: skip_syntax_errors local_parts = ^list syntax_errors_to = postmaster@test.ex - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} r1a: driver = redirect skip_syntax_errors local_parts = ^nmlist syntax_errors_to = postmaster@test.ex - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} no_more r2: @@ -46,7 +46,7 @@ r2: syntax_errors_to = postmaster@test.ex syntax_errors_text = "There's an error in your filter file.\n\ The file has been ignored." - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} allow_filter router_home_directory = DIR/ user = CALLER diff --git a/test/confs/0271 b/test/confs/0271 index 93c27241d..b9512dca1 100644 --- a/test/confs/0271 +++ b/test/confs/0271 @@ -14,7 +14,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # ----- Routers ----- diff --git a/test/confs/0274 b/test/confs/0274 index 2eb7bb60b..461acfcf3 100644 --- a/test/confs/0274 +++ b/test/confs/0274 @@ -14,7 +14,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/${if eq{$address_data}{}{$local_part}{$address_data}} + file = DIR/test-mail/${if eq{$address_data}{}{${bless:$local_part}}{$address_data}} user = CALLER # ----- Routers ----- diff --git a/test/confs/0280 b/test/confs/0280 index 40187df77..10717bdcf 100644 --- a/test/confs/0280 +++ b/test/confs/0280 @@ -18,7 +18,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # ----- Routers ----- diff --git a/test/confs/0281 b/test/confs/0281 index 277328ed4..3f737f392 100644 --- a/test/confs/0281 +++ b/test/confs/0281 @@ -68,7 +68,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0282 b/test/confs/0282 index 7eeddd2c4..00958b9a3 100644 --- a/test/confs/0282 +++ b/test/confs/0282 @@ -26,7 +26,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER headers_add = interface-port: $interface_port\n\ received-port: $received_port diff --git a/test/confs/0283 b/test/confs/0283 index 31d9339a2..7f40efb18 100644 --- a/test/confs/0283 +++ b/test/confs/0283 @@ -37,12 +37,12 @@ t1: t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t3: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = root # ----- Retry ----- diff --git a/test/confs/0284 b/test/confs/0284 index 0103742f4..98f5660b7 100644 --- a/test/confs/0284 +++ b/test/confs/0284 @@ -35,14 +35,14 @@ t1: t2: driver = appendfile batch_max = 100 - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} envelope_to_add user = CALLER t3: driver = appendfile batch_max = 100 - file = DIR/test-mail/$domain + file = DIR/test-mail/${bless:$domain} envelope_to_add user = CALLER diff --git a/test/confs/0289 b/test/confs/0289 index 8cd201862..56f50118b 100644 --- a/test/confs/0289 +++ b/test/confs/0289 @@ -26,7 +26,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0296 b/test/confs/0296 index e1f545aba..6241af003 100644 --- a/test/confs/0296 +++ b/test/confs/0296 @@ -25,7 +25,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0297 b/test/confs/0297 index b07fc54cb..2c98b99c5 100644 --- a/test/confs/0297 +++ b/test/confs/0297 @@ -17,7 +17,7 @@ begin routers r1: driver = redirect - data = $local_part + data = ${bless:$local_part} file_transport = ${if eq {$address_file}{/a/b/c}{tf1}{tf2}} directory_transport = ${if match{$address_file}{//\$}{td2}{td1}} user = CALLER diff --git a/test/confs/0298 b/test/confs/0298 index 3ca06f87f..f4f3990e2 100644 --- a/test/confs/0298 +++ b/test/confs/0298 @@ -32,7 +32,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0299 b/test/confs/0299 index d7dc87314..629f9c40d 100644 --- a/test/confs/0299 +++ b/test/confs/0299 @@ -30,7 +30,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER shadow_transport = t3 diff --git a/test/confs/0306 b/test/confs/0306 index 6d6d9658a..c8bd1f362 100644 --- a/test/confs/0306 +++ b/test/confs/0306 @@ -27,14 +27,14 @@ r1: driver = redirect domains = lists.test.ex local_part_suffix = -request - file = DIR/aux-fixed/TESTNUM/$local_part$local_part_suffix + file = DIR/aux-fixed/TESTNUM/${bless:$local_part}$local_part_suffix r2: driver = redirect domains = lists.test.ex senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\ {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}} - file = DIR/aux-fixed/TESTNUM/$local_part + file = DIR/aux-fixed/TESTNUM/${bless:$local_part} forbid_pipe forbid_file one_time @@ -64,7 +64,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0307 b/test/confs/0307 index 3252b4615..c2019893a 100644 --- a/test/confs/0307 +++ b/test/confs/0307 @@ -24,7 +24,7 @@ r1: ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\ {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}}\ }} - file = DIR/aux-fixed/TESTNUM/$local_part$local_part_suffix + file = DIR/aux-fixed/TESTNUM/${bless:$local_part}$local_part_suffix forbid_pipe forbid_file one_time @@ -54,7 +54,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0309 b/test/confs/0309 index 4d6449009..0a49f221d 100644 --- a/test/confs/0309 +++ b/test/confs/0309 @@ -29,13 +29,13 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} message_size_limit = $local_part user = CALLER bounce: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0310 b/test/confs/0310 index 0f324da1d..a999c2642 100644 --- a/test/confs/0310 +++ b/test/confs/0310 @@ -28,13 +28,13 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} quota = 5 user = CALLER bounce: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0318 b/test/confs/0318 index 51633d997..ec778a7fd 100644 --- a/test/confs/0318 +++ b/test/confs/0318 @@ -25,7 +25,7 @@ begin transports local_delivery: driver = appendfile directory = DIR/test-mail - directory_file = $local_part + directory_file = ${bless:$local_part} user = CALLER diff --git a/test/confs/0319 b/test/confs/0319 index aaa21d730..65416e8b4 100644 --- a/test/confs/0319 +++ b/test/confs/0319 @@ -31,7 +31,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER address_file: diff --git a/test/confs/0321 b/test/confs/0321 index 624202e65..e73eda67b 100644 --- a/test/confs/0321 +++ b/test/confs/0321 @@ -42,7 +42,7 @@ pipe: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0324 b/test/confs/0324 index 129e5df4c..3047764bb 100644 --- a/test/confs/0324 +++ b/test/confs/0324 @@ -25,7 +25,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0326 b/test/confs/0326 index 8f44d3c34..a983e071a 100644 --- a/test/confs/0326 +++ b/test/confs/0326 @@ -38,7 +38,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0327 b/test/confs/0327 index 481aaa7ae..85b4f894a 100644 --- a/test/confs/0327 +++ b/test/confs/0327 @@ -40,12 +40,12 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0328 b/test/confs/0328 index 76f898552..b52a2e195 100644 --- a/test/confs/0328 +++ b/test/confs/0328 @@ -28,7 +28,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0329 b/test/confs/0329 index f9d5bcbb5..e126d8c7e 100644 --- a/test/confs/0329 +++ b/test/confs/0329 @@ -29,7 +29,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0330 b/test/confs/0330 index 78701a9c5..066292d1c 100644 --- a/test/confs/0330 +++ b/test/confs/0330 @@ -37,7 +37,7 @@ begin transports appendfile: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0335 b/test/confs/0335 index 6529028d5..5a99e9bd1 100644 --- a/test/confs/0335 +++ b/test/confs/0335 @@ -28,7 +28,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER envelope_to_add diff --git a/test/confs/0338 b/test/confs/0338 index d373f477c..d3aa237e9 100644 --- a/test/confs/0338 +++ b/test/confs/0338 @@ -39,7 +39,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/0345 b/test/confs/0345 index 651d07068..939bbeaec 100644 --- a/test/confs/0345 +++ b/test/confs/0345 @@ -28,7 +28,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} quota = 20 user = CALLER diff --git a/test/confs/0346 b/test/confs/0346 index 1c4b51c50..61a487775 100644 --- a/test/confs/0346 +++ b/test/confs/0346 @@ -38,7 +38,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER envelope_to_add diff --git a/test/confs/0351 b/test/confs/0351 index b00ee7497..c4353bcff 100644 --- a/test/confs/0351 +++ b/test/confs/0351 @@ -27,7 +27,7 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "\n\ TO: $h_to:\n\ --------------------------------\n\ diff --git a/test/confs/0352 b/test/confs/0352 index aaa980941..1a37f4100 100644 --- a/test/confs/0352 +++ b/test/confs/0352 @@ -26,6 +26,6 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} # End diff --git a/test/confs/0353 b/test/confs/0353 index fb53d6d69..0f9ef9f4b 100644 --- a/test/confs/0353 +++ b/test/confs/0353 @@ -26,6 +26,6 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} # End diff --git a/test/confs/0354 b/test/confs/0354 index 03ea43f83..4cb670206 100644 --- a/test/confs/0354 +++ b/test/confs/0354 @@ -27,6 +27,6 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} # End diff --git a/test/confs/0355 b/test/confs/0355 index 78b1484c7..f24f02bbd 100644 --- a/test/confs/0355 +++ b/test/confs/0355 @@ -29,6 +29,6 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} # End diff --git a/test/confs/0359 b/test/confs/0359 index 6b6b8c093..5081b497e 100644 --- a/test/confs/0359 +++ b/test/confs/0359 @@ -30,7 +30,7 @@ t1: t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = X-shadowed: user = CALLER diff --git a/test/confs/0362 b/test/confs/0362 index cdfe7d532..34855e224 100644 --- a/test/confs/0362 +++ b/test/confs/0362 @@ -52,7 +52,7 @@ t1: t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0374 b/test/confs/0374 index 284344276..1cae0254c 100644 --- a/test/confs/0374 +++ b/test/confs/0374 @@ -50,7 +50,7 @@ begin transports # Successful local transport ut1: driver = appendfile - file = DIR/test-mail/$local_part-u + file = DIR/test-mail/${bless:$local_part}-u user = CALLER return_path_add envelope_to_add @@ -83,7 +83,7 @@ ut4: # Real delivery real: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER return_path_add envelope_to_add diff --git a/test/confs/0375 b/test/confs/0375 index 164f32788..dce134ef7 100644 --- a/test/confs/0375 +++ b/test/confs/0375 @@ -85,7 +85,7 @@ begin transports # Successful local transport ut1: driver = appendfile - file = DIR/test-mail/$local_part-u + file = DIR/test-mail/${bless:$local_part}-u user = CALLER return_path_add envelope_to_add @@ -146,7 +146,7 @@ ut6: # Real delivery real: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER return_path_add envelope_to_add diff --git a/test/confs/0377 b/test/confs/0377 index bd3391b3a..ba8c0aa6c 100644 --- a/test/confs/0377 +++ b/test/confs/0377 @@ -65,7 +65,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0379 b/test/confs/0379 index 2f1216b1f..a3d14231b 100644 --- a/test/confs/0379 +++ b/test/confs/0379 @@ -36,7 +36,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0380 b/test/confs/0380 index 90d1f933b..0bad1f7c2 100644 --- a/test/confs/0380 +++ b/test/confs/0380 @@ -25,13 +25,13 @@ r0: r1: driver = redirect local_parts = aaaa - file = DIR/non-exist/$local_part + file = DIR/non-exist/${bless:$local_part} r2: driver = redirect local_parts = bbbb ignore_enotdir - file = DIR/non-exist/$local_part + file = DIR/non-exist/${bless:$local_part} r3: driver = accept @@ -43,7 +43,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0383 b/test/confs/0383 index ea2f1dc28..1a2637515 100644 --- a/test/confs/0383 +++ b/test/confs/0383 @@ -39,7 +39,7 @@ t1: t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0385 b/test/confs/0385 index f66e6b818..4d67fed7b 100644 --- a/test/confs/0385 +++ b/test/confs/0385 @@ -31,7 +31,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0386 b/test/confs/0386 index 0af3202a3..983af9bd4 100644 --- a/test/confs/0386 +++ b/test/confs/0386 @@ -36,7 +36,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0393 b/test/confs/0393 index c029d0d71..7ec2e805f 100644 --- a/test/confs/0393 +++ b/test/confs/0393 @@ -27,7 +27,7 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} transport_filter = FILTER diff --git a/test/confs/0395 b/test/confs/0395 index b7fc3fd58..c1c91d51f 100644 --- a/test/confs/0395 +++ b/test/confs/0395 @@ -28,7 +28,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0398 b/test/confs/0398 index e71a01c2d..02b537032 100644 --- a/test/confs/0398 +++ b/test/confs/0398 @@ -54,7 +54,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0404 b/test/confs/0404 index 9d0dc5c90..542978c83 100644 --- a/test/confs/0404 +++ b/test/confs/0404 @@ -35,7 +35,7 @@ t1: t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0408 b/test/confs/0408 index 903b4ca7c..af74310c8 100644 --- a/test/confs/0408 +++ b/test/confs/0408 @@ -26,7 +26,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0412 b/test/confs/0412 index f8b9c69ff..75147a363 100644 --- a/test/confs/0412 +++ b/test/confs/0412 @@ -26,7 +26,7 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = "\n\ FROM: $h_from:\n\ --------------------------------\n\ diff --git a/test/confs/0421 b/test/confs/0421 index 6d12ce20b..99c2608e1 100644 --- a/test/confs/0421 +++ b/test/confs/0421 @@ -26,7 +26,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_rewrite = *@* abc@x.y.z user = CALLER diff --git a/test/confs/0428 b/test/confs/0428 index 5ee5cdbb8..b0bcb6548 100644 --- a/test/confs/0428 +++ b/test/confs/0428 @@ -151,7 +151,7 @@ begin transports t1: driver = appendfile file = ${if eq{$address_file}{inbox} \ - {DIR/test-mail/$local_part} \ + {DIR/test-mail/${bless:$local_part}} \ {${if eq{${substr_0_1:$address_file}}{/} \ {$address_file} \ {DIR/test-mail/$address_file} \ @@ -164,7 +164,7 @@ t1: t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} delivery_date_add envelope_to_add return_path_add diff --git a/test/confs/0431 b/test/confs/0431 index 4af033ca9..c76363eb3 100644 --- a/test/confs/0431 +++ b/test/confs/0431 @@ -48,7 +48,7 @@ t1: t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER use_bsmtp AFFIX diff --git a/test/confs/0436 b/test/confs/0436 index 2fcaef961..01f1ccb70 100644 --- a/test/confs/0436 +++ b/test/confs/0436 @@ -23,7 +23,7 @@ t1: driver = appendfile envelope_to_add use_bsmtp - file = DIR/test-mail/$sender_address_local_part + file = DIR/test-mail/${bless:$sender_address_local_part} user = CALLER batch_max = 20000 diff --git a/test/confs/0444 b/test/confs/0444 index 2c103ff69..7337a4012 100644 --- a/test/confs/0444 +++ b/test/confs/0444 @@ -28,7 +28,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0446 b/test/confs/0446 index 90e8a0245..ca8ef3953 100644 --- a/test/confs/0446 +++ b/test/confs/0446 @@ -43,7 +43,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0449 b/test/confs/0449 index d08da8341..1c0f675da 100644 --- a/test/confs/0449 +++ b/test/confs/0449 @@ -27,7 +27,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0452 b/test/confs/0452 index a94295a98..3608eeed2 100644 --- a/test/confs/0452 +++ b/test/confs/0452 @@ -32,7 +32,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0456 b/test/confs/0456 index 362d6b549..313aa14a6 100644 --- a/test/confs/0456 +++ b/test/confs/0456 @@ -30,7 +30,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # ----- Retry ----- diff --git a/test/confs/0460 b/test/confs/0460 index 6c6ec7477..4918700f9 100644 --- a/test/confs/0460 +++ b/test/confs/0460 @@ -29,7 +29,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0461 b/test/confs/0461 index 4aca116e5..6f476e500 100644 --- a/test/confs/0461 +++ b/test/confs/0461 @@ -43,7 +43,7 @@ t1: t2: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0472 b/test/confs/0472 index 09d563329..0ac7758f8 100644 --- a/test/confs/0472 +++ b/test/confs/0472 @@ -33,7 +33,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0480 b/test/confs/0480 index 6c2b688ec..d10d12bdd 100644 --- a/test/confs/0480 +++ b/test/confs/0480 @@ -42,7 +42,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0481 b/test/confs/0481 index ae1b78819..09e3ed89e 100644 --- a/test/confs/0481 +++ b/test/confs/0481 @@ -37,7 +37,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0485 b/test/confs/0485 index ad31830e0..e4711e049 100644 --- a/test/confs/0485 +++ b/test/confs/0485 @@ -54,7 +54,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0487 b/test/confs/0487 index a9c1babc0..98ff7bf58 100644 --- a/test/confs/0487 +++ b/test/confs/0487 @@ -25,7 +25,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_rewrite = \N$^\N bogus@bogus fw user = CALLER diff --git a/test/confs/0491 b/test/confs/0491 index c7d3eaec0..646f47afb 100644 --- a/test/confs/0491 +++ b/test/confs/0491 @@ -30,7 +30,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0493 b/test/confs/0493 index dd38fbc49..8de0b83d9 100644 --- a/test/confs/0493 +++ b/test/confs/0493 @@ -25,7 +25,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0494 b/test/confs/0494 index 8027cf482..fb159a783 100644 --- a/test/confs/0494 +++ b/test/confs/0494 @@ -29,7 +29,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0495 b/test/confs/0495 index dc1a394b0..589686a38 100644 --- a/test/confs/0495 +++ b/test/confs/0495 @@ -76,7 +76,7 @@ t2: t3: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t4: diff --git a/test/confs/0496 b/test/confs/0496 index 351cd802a..8819f6230 100644 --- a/test/confs/0496 +++ b/test/confs/0496 @@ -39,7 +39,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0500 b/test/confs/0500 index f3b225c66..74c41e72a 100644 --- a/test/confs/0500 +++ b/test/confs/0500 @@ -39,7 +39,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0503 b/test/confs/0503 index aab6cdb54..da39a89ca 100644 --- a/test/confs/0503 +++ b/test/confs/0503 @@ -26,7 +26,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER quota = 1000 MSIZE diff --git a/test/confs/0504 b/test/confs/0504 index 981ed16c3..d24fca96c 100644 --- a/test/confs/0504 +++ b/test/confs/0504 @@ -22,7 +22,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER transport_filter = /non/existent/file diff --git a/test/confs/0506 b/test/confs/0506 index d20db5f2f..35cdef19a 100644 --- a/test/confs/0506 +++ b/test/confs/0506 @@ -20,7 +20,7 @@ r1: user = EXIMUSER ALLOW FORBID - file = DIR/aux-fixed/TESTNUM.$local_part + file = DIR/aux-fixed/TESTNUM.${bless:$local_part} # ----- Retry ----- diff --git a/test/confs/0508 b/test/confs/0508 index 17a1dec10..580f6931e 100644 --- a/test/confs/0508 +++ b/test/confs/0508 @@ -33,7 +33,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0514 b/test/confs/0514 index 36a2ac3d2..2457c4033 100644 --- a/test/confs/0514 +++ b/test/confs/0514 @@ -25,7 +25,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0517 b/test/confs/0517 index cbb2d4dbb..cc991b2a3 100644 --- a/test/confs/0517 +++ b/test/confs/0517 @@ -36,7 +36,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0522 b/test/confs/0522 index 4909db849..2e499adf3 100644 --- a/test/confs/0522 +++ b/test/confs/0522 @@ -37,7 +37,7 @@ begin transports t0: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t1: diff --git a/test/confs/0523 b/test/confs/0523 index 9415855d7..9e86b5411 100644 --- a/test/confs/0523 +++ b/test/confs/0523 @@ -30,7 +30,7 @@ begin transports t0: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER envelope_to_add diff --git a/test/confs/0530 b/test/confs/0530 index 9eeb4cc9f..a3143a0c7 100644 --- a/test/confs/0530 +++ b/test/confs/0530 @@ -29,7 +29,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0531 b/test/confs/0531 index 0af86b968..f5e29e446 100644 --- a/test/confs/0531 +++ b/test/confs/0531 @@ -31,7 +31,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER lmtp: diff --git a/test/confs/0532 b/test/confs/0532 index e50c5de0e..3842776a5 100644 --- a/test/confs/0532 +++ b/test/confs/0532 @@ -69,7 +69,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0533 b/test/confs/0533 index 1dbc83b61..7c2ca9dc2 100644 --- a/test/confs/0533 +++ b/test/confs/0533 @@ -16,7 +16,7 @@ r1: driver = redirect local_part_prefix = file- local_part_suffix = =* - data = DIR/test-mail/${substr_1:$local_part_suffix} + data = DIR/test-mail/${bless:${substr_1:$local_part_suffix}} file_transport = t1 r2: diff --git a/test/confs/0535 b/test/confs/0535 index 004f795f5..7960c064d 100644 --- a/test/confs/0535 +++ b/test/confs/0535 @@ -36,7 +36,7 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} # End diff --git a/test/confs/0536 b/test/confs/0536 index e451f81fe..d526f7710 100644 --- a/test/confs/0536 +++ b/test/confs/0536 @@ -94,6 +94,6 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/0551 b/test/confs/0551 index 1b4465bdd..d5d2ffd57 100644 --- a/test/confs/0551 +++ b/test/confs/0551 @@ -26,6 +26,6 @@ begin transports t1: driver = appendfile user = CALLER - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} # End diff --git a/test/confs/0566 b/test/confs/0566 index cc661f78b..4692b22b1 100644 --- a/test/confs/0566 +++ b/test/confs/0566 @@ -55,7 +55,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0567 b/test/confs/0567 index 267566561..984aceba9 100644 --- a/test/confs/0567 +++ b/test/confs/0567 @@ -80,7 +80,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0571 b/test/confs/0571 index a818257f5..d7c19f14c 100644 --- a/test/confs/0571 +++ b/test/confs/0571 @@ -40,7 +40,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER t2: diff --git a/test/confs/0573 b/test/confs/0573 index 3c2b1aae1..388c53fd0 100644 --- a/test/confs/0573 +++ b/test/confs/0573 @@ -26,7 +26,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0584 b/test/confs/0584 new file mode 100644 index 000000000..654ecbfb9 --- /dev/null +++ b/test/confs/0584 @@ -0,0 +1,40 @@ +# Exim test configuration 0005 + +.include DIR/aux-var/std_conf_prefix + + +# ----- Main settings ----- + +domainlist local_domains = @ + +acl_smtp_rcpt = check_recipient +trusted_users = CALLER + + +# ----- ACL ----- + +begin acl + +check_recipient: + accept hosts = : + accept domains = +local_domains + deny message = relay not permitted + +# ----- Routers ----- + +begin routers + +localuser: + driver = accept + check_local_user + transport = local_delivery + +# ----- Transports ----- + +begin transports + +local_delivery: + driver = appendfile + file = DIR/test-mail/$local_part + +# End diff --git a/test/confs/0600 b/test/confs/0600 index 65c6c2af4..58257e55e 100644 --- a/test/confs/0600 +++ b/test/confs/0600 @@ -58,7 +58,7 @@ local_delivery: driver = appendfile 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" diff --git a/test/confs/0609 b/test/confs/0609 index e1ec0853e..2f658c4d5 100644 --- a/test/confs/0609 +++ b/test/confs/0609 @@ -37,7 +37,7 @@ begin transports appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/0618 b/test/confs/0618 index b92353397..d212e9875 100644 --- a/test/confs/0618 +++ b/test/confs/0618 @@ -84,7 +84,7 @@ bad_tpt: tofile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER event_action = ${acl {ev_log}} diff --git a/test/confs/0620 b/test/confs/0620 index 7f1b69415..6ee5ac654 100644 --- a/test/confs/0620 +++ b/test/confs/0620 @@ -60,7 +60,7 @@ begin transports local_delivery: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER headers_add = X-r1: <$r_r1>\nX-r2: <$r_r2>\nX-r3: <$r_r3> diff --git a/test/confs/0900 b/test/confs/0900 index 4c824c4b4..df1540cfb 100644 --- a/test/confs/0900 +++ b/test/confs/0900 @@ -96,7 +96,7 @@ local_delivery: driver = appendfile 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" diff --git a/test/confs/0901 b/test/confs/0901 index 2e299c7dd..ed465ace4 100644 --- a/test/confs/0901 +++ b/test/confs/0901 @@ -87,7 +87,7 @@ local_delivery: driver = appendfile 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" diff --git a/test/confs/0906 b/test/confs/0906 index c320b2569..031065359 100644 --- a/test/confs/0906 +++ b/test/confs/0906 @@ -74,7 +74,7 @@ begin transports local_delivery: driver = appendfile - 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" diff --git a/test/confs/1001 b/test/confs/1001 index e4ed6779b..878f4145d 100644 --- a/test/confs/1001 +++ b/test/confs/1001 @@ -28,7 +28,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/1002 b/test/confs/1002 index f0a4518f3..2ddf2a888 100644 --- a/test/confs/1002 +++ b/test/confs/1002 @@ -73,7 +73,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/1003 b/test/confs/1003 index df1e48891..6405a8725 100644 --- a/test/confs/1003 +++ b/test/confs/1003 @@ -38,7 +38,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER send_to_server1: diff --git a/test/confs/2002 b/test/confs/2002 index 6475fb7fb..6a322ff50 100644 --- a/test/confs/2002 +++ b/test/confs/2002 @@ -84,7 +84,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2003 b/test/confs/2003 index c3eece620..0ce5fdb98 100644 --- a/test/confs/2003 +++ b/test/confs/2003 @@ -43,7 +43,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2004 b/test/confs/2004 index 4cd622cef..f40e8ba83 100644 --- a/test/confs/2004 +++ b/test/confs/2004 @@ -44,7 +44,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2005 b/test/confs/2005 index 110bbef22..442f0509c 100644 --- a/test/confs/2005 +++ b/test/confs/2005 @@ -53,7 +53,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2007 b/test/confs/2007 index d666f6ac2..db46a6c6f 100644 --- a/test/confs/2007 +++ b/test/confs/2007 @@ -46,7 +46,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2008 b/test/confs/2008 index 1f12493c5..0fd5186ac 100644 --- a/test/confs/2008 +++ b/test/confs/2008 @@ -55,7 +55,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2013 b/test/confs/2013 index 1a23887b3..d81f160de 100644 --- a/test/confs/2013 +++ b/test/confs/2013 @@ -57,7 +57,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2014 b/test/confs/2014 index a50a875cf..ec7c0011f 100644 --- a/test/confs/2014 +++ b/test/confs/2014 @@ -52,7 +52,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn user = CALLER diff --git a/test/confs/2017 b/test/confs/2017 index 98fdc07ca..01612ef72 100644 --- a/test/confs/2017 +++ b/test/confs/2017 @@ -45,7 +45,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2019 b/test/confs/2019 index bd2cf5a6a..5d26fd033 100644 --- a/test/confs/2019 +++ b/test/confs/2019 @@ -49,7 +49,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2027 b/test/confs/2027 index c1b93a2ce..926b09a57 100644 --- a/test/confs/2027 +++ b/test/confs/2027 @@ -42,7 +42,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2032 b/test/confs/2032 index 9f69adca2..907ab9947 100644 --- a/test/confs/2032 +++ b/test/confs/2032 @@ -61,7 +61,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2038 b/test/confs/2038 index d5465e30d..677bc9ee3 100644 --- a/test/confs/2038 +++ b/test/confs/2038 @@ -50,7 +50,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2102 b/test/confs/2102 index 5e156d486..6ae1514e9 100644 --- a/test/confs/2102 +++ b/test/confs/2102 @@ -94,7 +94,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2103 b/test/confs/2103 index a9daf05b7..5a8571f09 100644 --- a/test/confs/2103 +++ b/test/confs/2103 @@ -43,7 +43,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2104 b/test/confs/2104 index 7cd35f0e2..d37523c8b 100644 --- a/test/confs/2104 +++ b/test/confs/2104 @@ -44,7 +44,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2105 b/test/confs/2105 index c77c1547f..7cbbdf017 100644 --- a/test/confs/2105 +++ b/test/confs/2105 @@ -53,7 +53,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2107 b/test/confs/2107 index 5cf1dc373..1f96800e3 100644 --- a/test/confs/2107 +++ b/test/confs/2107 @@ -45,7 +45,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2108 b/test/confs/2108 index 5db771d13..c9720e46a 100644 --- a/test/confs/2108 +++ b/test/confs/2108 @@ -53,7 +53,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2113 b/test/confs/2113 index eb9d2b487..e5fc5393d 100644 --- a/test/confs/2113 +++ b/test/confs/2113 @@ -57,7 +57,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2114 b/test/confs/2114 index 557479dc9..17d5ff2d1 100644 --- a/test/confs/2114 +++ b/test/confs/2114 @@ -52,7 +52,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn user = CALLER diff --git a/test/confs/2117 b/test/confs/2117 index cdec8306b..f05eedb0a 100644 --- a/test/confs/2117 +++ b/test/confs/2117 @@ -45,7 +45,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2119 b/test/confs/2119 index fbd83769c..64987c8c0 100644 --- a/test/confs/2119 +++ b/test/confs/2119 @@ -49,7 +49,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2127 b/test/confs/2127 index 65e1901f6..148eb7ef0 100644 --- a/test/confs/2127 +++ b/test/confs/2127 @@ -46,7 +46,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2132 b/test/confs/2132 index 4d90a9cd7..7329e28d1 100644 --- a/test/confs/2132 +++ b/test/confs/2132 @@ -55,7 +55,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2138 b/test/confs/2138 index d5dba1b3f..aedeacf2f 100644 --- a/test/confs/2138 +++ b/test/confs/2138 @@ -50,7 +50,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2149 b/test/confs/2149 index ee48a51b3..41e71486f 100644 --- a/test/confs/2149 +++ b/test/confs/2149 @@ -41,7 +41,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/2201 b/test/confs/2201 index 4ce79253d..3f8f4fb62 100644 --- a/test/confs/2201 +++ b/test/confs/2201 @@ -67,7 +67,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER remote_delivery: diff --git a/test/confs/3206 b/test/confs/3206 index e4085ad6c..d672ad493 100644 --- a/test/confs/3206 +++ b/test/confs/3206 @@ -35,7 +35,7 @@ begin transports local_delivery: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/3207 b/test/confs/3207 index bf8d1d4c5..46b7d69dd 100644 --- a/test/confs/3207 +++ b/test/confs/3207 @@ -77,7 +77,7 @@ begin transports local_delivery: driver = appendfile envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER smtp: diff --git a/test/confs/3400 b/test/confs/3400 index 6b817c2f4..d94e70d7c 100644 --- a/test/confs/3400 +++ b/test/confs/3400 @@ -151,7 +151,7 @@ appendfile: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/3403 b/test/confs/3403 index b8c8086b6..161cdeaee 100644 --- a/test/confs/3403 +++ b/test/confs/3403 @@ -50,7 +50,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/3408 b/test/confs/3408 index 14f5c6249..7de4a6dd5 100644 --- a/test/confs/3408 +++ b/test/confs/3408 @@ -68,7 +68,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add # End diff --git a/test/confs/3411 b/test/confs/3411 index 44feae7bd..b50220887 100644 --- a/test/confs/3411 +++ b/test/confs/3411 @@ -87,7 +87,7 @@ dev_null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/3451 b/test/confs/3451 index 160f9e086..f453873cb 100644 --- a/test/confs/3451 +++ b/test/confs/3451 @@ -61,7 +61,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/3452 b/test/confs/3452 index 108d93edc..e4d02b74b 100644 --- a/test/confs/3452 +++ b/test/confs/3452 @@ -59,7 +59,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/3461 b/test/confs/3461 index 35c2a17b2..f865057fd 100644 --- a/test/confs/3461 +++ b/test/confs/3461 @@ -61,7 +61,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/3462 b/test/confs/3462 index 3f8c401de..6c3aaee8d 100644 --- a/test/confs/3462 +++ b/test/confs/3462 @@ -59,7 +59,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/3500 b/test/confs/3500 index 68cf703be..2419dece4 100644 --- a/test/confs/3500 +++ b/test/confs/3500 @@ -102,7 +102,7 @@ appendfile: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/3700 b/test/confs/3700 index 39e3bcece..4a8d38aae 100644 --- a/test/confs/3700 +++ b/test/confs/3700 @@ -95,7 +95,7 @@ t2: file: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/3720 b/test/confs/3720 index 53a68d31e..397e4e94d 100644 --- a/test/confs/3720 +++ b/test/confs/3720 @@ -88,7 +88,7 @@ t1: file: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/4000 b/test/confs/4000 index a62f7c6a3..d80aaa8f1 100644 --- a/test/confs/4000 +++ b/test/confs/4000 @@ -52,7 +52,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/4001 b/test/confs/4001 index 334ca0cae..cf124eccf 100644 --- a/test/confs/4001 +++ b/test/confs/4001 @@ -46,7 +46,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/4201 b/test/confs/4201 index 8ded6c27c..a2c45a327 100644 --- a/test/confs/4201 +++ b/test/confs/4201 @@ -116,7 +116,7 @@ local_delivery: 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" diff --git a/test/confs/4211 b/test/confs/4211 index e68111eb7..d4aaa441b 100644 --- a/test/confs/4211 +++ b/test/confs/4211 @@ -107,7 +107,7 @@ local_delivery: 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" diff --git a/test/confs/4221 b/test/confs/4221 index e68111eb7..d4aaa441b 100644 --- a/test/confs/4221 +++ b/test/confs/4221 @@ -107,7 +107,7 @@ local_delivery: 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" diff --git a/test/confs/4520 b/test/confs/4520 index 3f49ca996..770d8cc62 100644 --- a/test/confs/4520 +++ b/test/confs/4520 @@ -77,7 +77,7 @@ send_to_server: file: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/4525 b/test/confs/4525 index e11456cd2..a5b7f2cd0 100644 --- a/test/confs/4525 +++ b/test/confs/4525 @@ -107,7 +107,7 @@ send_to_server: file: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/4560 b/test/confs/4560 index d945999a6..8c5864b9a 100644 --- a/test/confs/4560 +++ b/test/confs/4560 @@ -78,7 +78,7 @@ begin transports tfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER tsmtp: diff --git a/test/confs/4565 b/test/confs/4565 index 4e90606f2..9f1058fb1 100644 --- a/test/confs/4565 +++ b/test/confs/4565 @@ -59,7 +59,7 @@ begin transports tfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER tsmtp: diff --git a/test/confs/4620 b/test/confs/4620 index 5b1175a53..26906e7c7 100644 --- a/test/confs/4620 +++ b/test/confs/4620 @@ -75,7 +75,7 @@ forwarded_external: appendfile: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # ----- Retry ----- diff --git a/test/confs/4700 b/test/confs/4700 index 86d8b6d8d..04cc37082 100644 --- a/test/confs/4700 +++ b/test/confs/4700 @@ -52,7 +52,7 @@ smtp: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/5001 b/test/confs/5001 index db8c7dc1f..7bf79ae38 100644 --- a/test/confs/5001 +++ b/test/confs/5001 @@ -29,7 +29,7 @@ maildir: create_file = belowhome directory = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.filelist}\ {${if match{$value}{^/}{}{DIR/}}$value}\ - {DIR/test-mail/$local_part}} + {DIR/test-mail/${bless:$local_part}}} user = CALLER diff --git a/test/confs/5003 b/test/confs/5003 index 763567326..5aa96819f 100644 --- a/test/confs/5003 +++ b/test/confs/5003 @@ -24,14 +24,14 @@ begin transports local_delivery: driver = appendfile - directory = DIR/test-mail/$local_part + directory = DIR/test-mail/${bless:$local_part} maildir_format quota = 1.5K user = CALLER local_delivery2: driver = appendfile - directory = DIR/test-mail/$local_part/ + directory = DIR/test-mail/${bless:$local_part}/ maildir_format quota = 1.5K user = CALLER diff --git a/test/confs/5005 b/test/confs/5005 index d5d497a06..e5a7ef362 100644 --- a/test/confs/5005 +++ b/test/confs/5005 @@ -27,7 +27,7 @@ begin transports t1: driver = appendfile - directory = DIR/test-mail/$local_part + directory = DIR/test-mail/${bless:$local_part} user = CALLER maildir_format maildir_use_size_file diff --git a/test/confs/5006 b/test/confs/5006 index 385d4fe08..17cba3c99 100644 --- a/test/confs/5006 +++ b/test/confs/5006 @@ -24,7 +24,7 @@ begin transports t1: driver = appendfile - directory = DIR/test-mail/$local_part + directory = DIR/test-mail/${bless:$local_part} user = CALLER maildir_format maildir_use_size_file diff --git a/test/confs/5007 b/test/confs/5007 index 98f70ee6d..7929b406f 100644 --- a/test/confs/5007 +++ b/test/confs/5007 @@ -27,7 +27,7 @@ begin transports t1: driver = appendfile - directory = DIR/test-mail/$local_part + directory = DIR/test-mail/${bless:$local_part} user = CALLER maildir_format maildir_use_size_file diff --git a/test/confs/5008 b/test/confs/5008 index 027ba7a54..1e904d488 100644 --- a/test/confs/5008 +++ b/test/confs/5008 @@ -27,7 +27,7 @@ begin transports t1: driver = appendfile - directory = DIR/test-mail/$local_part + directory = DIR/test-mail/${bless:$local_part} user = CALLER maildir_format mailbox_size = 100K diff --git a/test/confs/5050 b/test/confs/5050 index 4258a727f..af6220121 100644 --- a/test/confs/5050 +++ b/test/confs/5050 @@ -32,7 +32,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} file_format = "From : local_delivery :\ *mbx*\r\n : mbx_local_delivery :\ tpmissing : tpmissing" @@ -45,7 +45,7 @@ bsmtp_local_delivery: use_bsmtp delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER @@ -54,7 +54,7 @@ mbx_local_delivery: check_string = delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} mbx_format message_prefix = return_path_add diff --git a/test/confs/5101 b/test/confs/5101 index 1dbe3e466..1002009f5 100644 --- a/test/confs/5101 +++ b/test/confs/5101 @@ -35,7 +35,7 @@ local_delivery: envelope_to_add headers_add = X-Recipient: local_part=$local_part domain=$domain\n\ X-Home: $home - file = DIR/test-mail/${if eq{$sender_address}{}{copied}{$h_mailbox:}} + file = DIR/test-mail/${if eq{$sender_address}{}{copied}{${bless:$h_mailbox:}}} user = CALLER lmtp: diff --git a/test/confs/5200 b/test/confs/5200 index cafd2fb5e..d30bc3533 100644 --- a/test/confs/5200 +++ b/test/confs/5200 @@ -36,7 +36,7 @@ local_delivery: driver = appendfile delivery_date_add envelope_to_add - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} return_path_add user = CALLER diff --git a/test/confs/5201 b/test/confs/5201 index f273d92fa..2af73f244 100644 --- a/test/confs/5201 +++ b/test/confs/5201 @@ -34,7 +34,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/5203 b/test/confs/5203 index 40f4c8370..7a1f943a6 100644 --- a/test/confs/5203 +++ b/test/confs/5203 @@ -27,7 +27,7 @@ begin transports userx_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} message_suffix = "$address_data\n" user = CALLER diff --git a/test/confs/5204 b/test/confs/5204 index e81c58e98..a6812213b 100644 --- a/test/confs/5204 +++ b/test/confs/5204 @@ -64,7 +64,7 @@ null: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/5207 b/test/confs/5207 index bfd32bb3b..9465cfceb 100644 --- a/test/confs/5207 +++ b/test/confs/5207 @@ -14,7 +14,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/${if eq{$address_data}{}{$local_part}{$address_data}} + file = DIR/test-mail/${if eq{$address_data}{}{${bless:$local_part}}{$address_data}} user = CALLER # ----- Routers ----- diff --git a/test/confs/5500 b/test/confs/5500 index 1b25be1f8..91dc4275d 100644 --- a/test/confs/5500 +++ b/test/confs/5500 @@ -45,7 +45,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # ----- Routers ----- diff --git a/test/confs/5600 b/test/confs/5600 index b65a2797e..7526b9cc4 100644 --- a/test/confs/5600 +++ b/test/confs/5600 @@ -66,7 +66,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5610 b/test/confs/5610 index b65a2797e..7526b9cc4 100644 --- a/test/confs/5610 +++ b/test/confs/5610 @@ -66,7 +66,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5611 b/test/confs/5611 index 9ba6350cc..09c81ffe9 100644 --- a/test/confs/5611 +++ b/test/confs/5611 @@ -85,7 +85,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5650 b/test/confs/5650 index 840b74ce0..c48428232 100644 --- a/test/confs/5650 +++ b/test/confs/5650 @@ -65,7 +65,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5651 b/test/confs/5651 index 1e3ed5a1e..0e5e27b85 100644 --- a/test/confs/5651 +++ b/test/confs/5651 @@ -83,7 +83,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5665 b/test/confs/5665 index 673ec6656..9ced25da4 100644 --- a/test/confs/5665 +++ b/test/confs/5665 @@ -95,7 +95,7 @@ remote_delivery: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5670 b/test/confs/5670 index 6fbd7c12a..325ac885b 100644 --- a/test/confs/5670 +++ b/test/confs/5670 @@ -96,7 +96,7 @@ remote_delivery: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5730 b/test/confs/5730 index 0279cf10e..88c229802 100644 --- a/test/confs/5730 +++ b/test/confs/5730 @@ -92,7 +92,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5740 b/test/confs/5740 index 32423f137..5dcbcb5bb 100644 --- a/test/confs/5740 +++ b/test/confs/5740 @@ -93,7 +93,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn user = CALLER diff --git a/test/confs/5902 b/test/confs/5902 index ba4acc29f..ec4306b47 100644 --- a/test/confs/5902 +++ b/test/confs/5902 @@ -32,7 +32,7 @@ scan: local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER # End diff --git a/test/confs/9001 b/test/confs/9001 index 0518519b8..a1f4ba3eb 100644 --- a/test/confs/9001 +++ b/test/confs/9001 @@ -28,7 +28,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER diff --git a/test/confs/9400 b/test/confs/9400 index 66ee61edc..0b54c9675 100644 --- a/test/confs/9400 +++ b/test/confs/9400 @@ -42,7 +42,7 @@ begin transports local_delivery: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER headers_add = ${if eq {$local_scan_data}{}{}{LSD: $local_scan_data}} diff --git a/test/confs/9401 b/test/confs/9401 index a01167ecb..ed83ed3de 100644 --- a/test/confs/9401 +++ b/test/confs/9401 @@ -30,7 +30,7 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/$local_part + file = DIR/test-mail/${bless:$local_part} user = CALLER headers_add = X-lsd: >$local_scan_data< |