appendfile: taint-enforce file & directory options

testsuite: bless facility

diff --git a/doc/doc-docbook/spec.xfpt b/doc/doc-docbook/spec.xfpt
index 254ed69cc468f5b9f479dc3342741fa835108f98..bb2ce122c9af82d65c0b5ac4025c0c57c0a87e07 100644 (file)
--- a/doc/doc-docbook/spec.xfpt
+++ b/doc/doc-docbook/spec.xfpt
@@ -22371,6 +22371,14 @@ If &%file%& or &%directory%& is set for a delivery from a redirection, it is
 used to determine the file or directory name for the delivery. Normally, the
 contents of &$address_file$& are used in some way in the string expansion.
 .endlist
+.new
+.cindex "tainted data" "in filenames"
+.cindex appendfile "tainted data"
+Tainted data may not be used for a file or directory name.
+This means that, for instance, &$local_part$& cannot be used directly
+as a component of a path.  It can however be used as the key for a lookup
+which returns a path (or component).
+.wen
 
 
 .cindex "Sieve filter" "configuring &(appendfile)&"

diff --git a/doc/doc-txt/ChangeLog b/doc/doc-txt/ChangeLog
index 2b5b592c5a5de145cb27a43fe7eaea687ef72dec..27292954ac22fc97a3655b63740e1c09fcef3233 100644 (file)
--- a/doc/doc-txt/ChangeLog
+++ b/doc/doc-txt/ChangeLog
@@ -87,6 +87,9 @@ JH/19 Bug 2507: Modules: on handling a dynamic-module (lookups) open failure,
       were used, and the second one (for mainlog/paniclog) retrieved null
       information.
 
+JH/20 Taint checking: disallow use of tainted data for the appendfile transport
+      file and directory options.  Previously this was permitted.
+
 
 Exim version 4.93
 -----------------

diff --git a/src/src/expand.c b/src/src/expand.c
index cec6efd54ba2e879062c0bf0e7f369a8179657b4..fe5384ab8f09fc2ecfdf2dedea26ab7825b4691e 100644 (file)
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -213,6 +213,7 @@ static uschar *op_table_main[] = {
   US"base62d",
   US"base64",
   US"base64d",
+  US"bless",
   US"domain",
   US"escape",
   US"escape8bit",
@@ -260,6 +261,7 @@ enum {
   EOP_BASE62D,
   EOP_BASE64,
   EOP_BASE64D,
+  EOP_BLESS,
   EOP_DOMAIN,
   EOP_ESCAPE,
   EOP_ESCAPE8BIT,
@@ -7059,6 +7061,20 @@ while (*s != 0)
         continue;
         }
 
+      case EOP_BLESS:
+       /* This is purely for the convenience of the test harness.  Do not enable
+       it otherwise as it defeats the taint-checking security. */
+
+       if (f.running_in_test_harness)
+         yield = string_cat(yield, is_tainted(sub)
+                                   ? string_copy_taint(sub, FALSE) : sub);
+       else
+         {
+         DEBUG(D_expand) debug_printf_indent("bless operator not supported\n");
+         yield = string_cat(yield, sub);
+         }
+       continue;
+
       case EOP_EXPAND:
         {
         uschar *expanded = expand_string_internal(sub, FALSE, NULL, skipping, TRUE, &resetok);

diff --git a/src/src/rda.c b/src/src/rda.c
index 5fa3d09b44322986fddc15ce1b4acde09aed5796..201e82d8b8a0bee54fd1344f9d622f1c0eba9d18 100644 (file)
--- a/src/src/rda.c
+++ b/src/src/rda.c
@@ -557,7 +557,8 @@ if (!(data = expand_string(rdata->string)))
   }
 rdata->string = data;
 
-DEBUG(D_route) debug_printf("expanded: '%s'\n", data);
+DEBUG(D_route)
+  debug_printf("expanded: '%s'%s\n", data, is_tainted(data) ? " (tainted)":"");
 
 if (rdata->isfile && data[0] != '/')
   {

diff --git a/src/src/transports/appendfile.c b/src/src/transports/appendfile.c
index d99a1795679c1d42681706de96d20e6187193753..de193db448bbf5cf5801313799e08e3c60fce43b 100644 (file)
--- a/src/src/transports/appendfile.c
+++ b/src/src/transports/appendfile.c
@@ -3,6 +3,7 @@
 *************************************************/
 
 /* Copyright (c) University of Cambridge 1995 - 2018 */
+/* Copyright (c) The Exim maintainers 2020 */
 /* See the file NOTICE for conditions of use and distribution. */
 
 
@@ -1342,6 +1343,12 @@ if (!(path = expand_string(fdname)))
     expand_string_message);
   goto ret_panic;
   }
+if (is_tainted(path))
+  {
+  addr->message = string_sprintf("Tainted '%s' (file or directory "
+    "name for %s transport) not permitted", path, tblock->name);
+  goto ret_panic;
+  }
 
 if (path[0] != '/')
   {

diff --git a/test/aux-fixed/0297.Filter b/test/aux-fixed/0297.Filter
index e911ce75c05e57547f00e196b1c4c6a7d3d7c306..28f090eadc83b8cd1aa8e3a53e8667d715eb1aaa 100644 (file)
--- a/test/aux-fixed/0297.Filter
+++ b/test/aux-fixed/0297.Filter
@@ -2,4 +2,4 @@
 
 if $sender_address is not fil@ter then finish endif
 
-save ${local_part:$recipients}
+save ${bless:${local_part:$recipients}}

diff --git a/test/confs/0001 b/test/confs/0001
index 4dfd09aeacbca3eaf4008856538cffdfa47211fc..c8ad6f43fecfab27f4a0257ac8ac0751291113ab 100644 (file)
--- 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 c01a2fe2e7a4d463ebbf48cd2c406bd0639829b4..b83e897cad4ff611f1d68a29ead0788d95eaa215 100644 (file)
--- 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 91db09111b530e4b82a42984fed03f49482ebdcd..396718f9839332dd1e530441b57e16fb1b036c82 100644 (file)
--- 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 422fe3d1d2271a6815cf7d145e9c64d62a032439..3ca2feb7a6483681d2419d62615e8108df711dd1 100644 (file)
--- 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 39e3fcf88ec8428470c16e4e3822140a3a5e615e..0216aae14e3dac96435be9049e57bf3c17d495f7 100644 (file)
--- 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 f8c04763d927ff29737bb09005b3632193b6fe99..e39d595630396c3036d051f8efdff27771fe6fca 100644 (file)
--- 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 b367e8992a92ea7273cc6e2775bdf56f517030fa..76f5bc4ac6e4e5f873d386ddb2af20b0a4ceeaef 100644 (file)
--- 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 1fdd92d0c29c6087bc2aeaa46cd476aa1ee11304..23abbb240bdb5161d35a99ac08ee6299890c6e1a 100644 (file)
--- 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 dbbdfd059943ecfc444acc5e18a4243b1a6199fa..8c62e2e08d255c4b96a35bb23c7e0d3182b9793a 100644 (file)
--- 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 4260c88be97859afb055fa2d60d73abc60684622..dcc005f0b3f81c7dba6d091fc5a20dbc1e71bfca 100644 (file)
--- 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 cb057386eaed0306ec8a0f1f553c91cc88e313a6..0150839b431e000c52b4acc987f08cf8c7155ef6 100644 (file)
--- 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 bd04442aa783bffb01dc27761566bfbd19b70ba2..2228b280714f53ab8317ba0ca63b23112898ca32 100644 (file)
--- 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 2481976ce09531ea3c38431ef8340392b09c3224..c72c453a22b6a388fbd87b8580b87fd8123d856b 100644 (file)
--- 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 3dbbc2c258a464c2d2b13e130fa0fb02e898b56b..30e5636e9b573c71531054a6484ddcdc5c5e9d38 100644 (file)
--- 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 3ecc5dd6898a1b6377d1826ed0afd8162b24498b..f2d987e1340e676bcf821633383261255ecaf6c8 100644 (file)
--- 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 07fa409760ef9f23067182fa4313b78530295fc5..cc0c51c9b1d61ac37a1038a210184f5ccefad958 100644 (file)
--- 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 9c775bd5d45351b43c6b982b6d8d55fd22d2635b..19bdaa0b6d987bea1ecc9fef7d2136657ab07d53 100644 (file)
--- 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 149d8eda8277ec2014676d66c8a7789ce20ce75d..caebac0ce573ee48ef00ae13b2f1a146c805d055 100644 (file)
--- 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 e3f0360fc5cc85d8152fec3f1dd2f2746e0fd4ae..8760be578735dbdb5806ae91b8c8333bf1bd2c40 100644 (file)
--- 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 caf5edb289fa5488efd52e95588a54393335c3c6..644404d241182c1b9854bc68c85572a508530105 100644 (file)
--- 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 ded64879f49ae71a5a1db1ec815fa2727216fcc3..6d02a44cd7fe9b95a81d5d622d473dd610064204 100644 (file)
--- 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 8ba94ded1defca8afaa6c131d541f16cdb940354..06a38564d84a556b1d7d146c3a0a3a939be32805 100644 (file)
--- 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 35453a0dd3373d65c19e7dc89fb18a2129ab4fdf..30a3de2340a8d230ddd2e5a67ec4c7720c363040 100644 (file)
--- 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 f7fa61ed845d8dffcec61cdab05572cd7f6dd302..0d601a8929b20256ffdb5418fb65eb97468b5015 100644 (file)
--- 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 14c8a963567fd51dd55ebc0c8710da3b4ac98d5e..46229f59fa68e60f861108b58a477a2bd55bf08a 100644 (file)
--- 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 0bf3547c7192cde61fed8e8c7f82c2393f2e3cf0..91d58f338d166cb17c1f39bf1418b1eab904ee85 100644 (file)
--- 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 e4db43db01662f6eecec92249c7d7f8e2979e3fc..c13a158179c9b513376f6c8d0af8f8d61dfc6f35 100644 (file)
--- 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 9fff3b91b92432986015610fd42fedf726a50a25..15e8df80faec0fd27bd6118477628dc53c615aa7 100644 (file)
--- 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 9c2d4428fd904d8f31e2db61a6bc98ad0b90d36c..d11a120f1af04771c9d8b369d7ac9d825c77d36f 100644 (file)
--- 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 a00dde1f52b438633c92787d8e7004f5fff9922e..fd2574ea8e1f9b6c2f13807e15208731ad4e957d 100644 (file)
--- 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 32a822a9b06c212ce9caa727ce0f843e29342d1f..32c414aa13ec2518c5e4a98a555e78e1b94bf113 100644 (file)
--- 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 2fde9e5572355981a41a8277e3e37b9945568ea9..a14fc3ddcaae62df0dbd3655d6cfaaf3d80f35dd 100644 (file)
--- 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 2af555ccae3a35dbbefba5ee81c9945e6874a22b..426e7ed9813392bab0c256b0e326986d40df8df2 100644 (file)
--- 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 04263a59f85f4dac1eb7ae1d8f87600e7170ba77..4d279d0abba553dddcf07da66fa0c6f867af58b2 100644 (file)
--- 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 6cc9b7c18e47f78c55d73697ae62ddb22e0ba5e1..ed6e60878451461dd002f59cc437ecb0d09baa3c 100644 (file)
--- 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 9bb73984d6cd90aa58c62725f935cc313641a5d1..e1e997b9aaaf864358ba7cb47e1acc9f5502e916 100644 (file)
--- 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 da716efb6b94548839b33a30757ed335caffa4a6..6788256736ec30bb3ee15bbab56561675bbff95c 100644 (file)
--- 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 3102206b0b4476c3bdd02cfc0e0bb66125223d09..20227d416cf40a31fad844421c25b707f53f19f7 100644 (file)
--- 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 8b8c77ca6783f4ff275f46987389bc7624be73af..b07ffbdfd220871104af9305043f7927d6d02b0e 100644 (file)
--- 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 1415280f9def6bbf27ddb37c5749d36455dc7678..8e9c08f806c97caffb5b25c0b5f5baadb14dc9d7 100644 (file)
--- 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 25ef65879c5d2f6afbc77b96554f7b17944e3554..a7a412ffa2dc27b2b90a988bc2e53d7ea189c551 100644 (file)
--- 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 fbe026c262dc338015621b6b01be7c4347347c6d..a0f578f614e4f2f5ed1cc5d17db81ea0c86062c0 100644 (file)
--- 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 f403728c3c4b28a9f93e56258df7be5ab945aa34..2e020e01d20353c08eb46861dbd98b48783cdcfd 100644 (file)
--- 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 29ff8d15cafa3ded3d4c954c79db0c715c57cced..fca3e7b0daa9e80ed40410cde9407eda4bbac4f5 100644 (file)
--- 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 fcae1f5d1bef283ce5af7c7ec608f91b61738602..4ab79fce45df22f294ea0d9e88750ed3c7a06e44 100644 (file)
--- 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 94e386e02434bc656ef7c7858a49a81b6fefb345..bbee05f04222a0e6a554a7d8a16671d7c2e04158 100644 (file)
--- 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 907d275440575b411bc0ede0d730a21e74df0e0f..f5dc6f2913032c1f134aa8252c2ee121d09845c7 100644 (file)
--- 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 04c9d80789997d17a36808ca99440cba3f50344f..07698b5c0a0291ccac507ef9b51d217de35400c8 100644 (file)
--- 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 c20b06d7cc100c257bdd7f8d93e26b2aeaee55a9..b1201f8709a7bc5871c380f3dba1646a1ad3c8f3 100644 (file)
--- 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 ff5f5cebc1dff8e7fcbef31d838fe0846f56f371..1eb519417f56e26a0968f648d74126421ba30c07 100644 (file)
--- 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 0841952bf1cefb1d1c9ce5bec8f44766411ddac2..495349d3fc46f3bd3569c533d01a3deb536032fb 100644 (file)
--- 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 cce115f12ed386d9b517c47e2abee5602ecfc4c0..e16b25eaaca3f105723c2c952fa1956fee79bc01 100644 (file)
--- 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 143ff4cfe2e95ef2016381f51beca462237ef137..afe04a4c1c95bdbfc1e139061728c7f24437c809 100644 (file)
--- 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 2497fd032b422b611441b8b614df8ff0a8f3031d..30b1496ac876ac5d8c7b90f0568f5b74c7651673 100644 (file)
--- 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 9a136c7bc0979b7c9137eb5668df3cdadccc2124..547109ab54e1836156593a6553dfcce7ef5dd53e 100644 (file)
--- 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 de0889adb41e7a7bc5b66f7dce5e60431bcb0381..3cbebc856899a8306d68eb1d6d0e44cddd214f49 100644 (file)
--- 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 1b954f4605e824a86c9f9589e3000637226a7ee8..851f12cc1cefea0bd164088d170896dff8bb4786 100644 (file)
--- 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 9bbb7e7a3b2fc4fefa065ad74332690e76700677..5f6a80e8788e1247af39e1cbe8e6a8f55774316e 100644 (file)
--- 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 361c12fb40f5549b904d172f69492e989b556aa9..e4716f625e089b7a46f15f289b9fd1a2d1577bde 100644 (file)
--- 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 61fc9a887f8ad9bbd174609f3f40385cd2487f9d..3b4386b707ba207331359bda76cc07bb54012a81 100644 (file)
--- 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 1fd61009fce35b00b0f47e7efb70325656e9184a..2c0c573a36b09198ea7b8c52eb83d682762c50c1 100644 (file)
--- 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 313d32c6301c0fb8b69aad0792ca62dda1f2caf4..6916642e111aabec441e0defc088027bbaa8a54b 100644 (file)
--- 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 cf8838f32a2bc9fc992d66bb8a389f179388844e..1f741cc0a2ee576720673c4b32f5574942fa5d44 100644 (file)
--- 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 ca2d338a1e82b25dc42f939445886c9fd1c4dafa..550971e40fc5d57742ccd41e4874278ca74485f7 100644 (file)
--- 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 1906bb430376f5da0369ec6970a5003e816d3f31..83dd03198dbde4cea380a9f181c6052ca2db5d09 100644 (file)
--- 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 9acfb5e9ddcd16cb001b1ff9c20ff692a502c1bd..e4f78dca21cfe6275a38cc40d7d7e25fb0066005 100644 (file)
--- 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 c55813e7734c2d2c862a18c9d01c720c9dc68ea2..c3df9a89e7d5660a4ad1312df3b1dd078b2716d6 100644 (file)
--- 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 bc4e6283f5370b6464bd9e7ecb2d56269d1d151c..2c9cdb88e5f43f0428b8bc0f9165f271bfad5c1b 100644 (file)
--- 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 7fd5bdaa5647f841bd424f99ef92484a39adfdc1..1318e025c655ac9d36da63e69333a6ab25b5fa1e 100644 (file)
--- 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 efc73c58d09de49cb65dc024422eb65065bdc725..acc1003c91d160c1c0a0ceeab3440c54569990d7 100644 (file)
--- 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 7c48d62349121cf588817ed9460cdbbf7cfb9ded..faab263aacb545690cb5a75e81aa63e370e0a6df 100644 (file)
--- 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 66539d6b049649db734605eaf14299e195bc715d..01bdfaa62111b5af0ba33477bc51ac0c3c52b2ad 100644 (file)
--- 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 eb3990c7281c54c2430ef748435d265e87e26c9a..13a90df0a231daf2293f377e441d51803d0fe610 100644 (file)
--- 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 02567153ceff659d983b0500e8fa8dcd210842f6..5661c5df46551babcf27459fedc2d3c3009331b2 100644 (file)
--- 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 748e76b8baa6bd5d3209756835a80147fbda6dcb..716ad5fa75d32a78deb79cb6c940361e307064bb 100644 (file)
--- 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 60c742acf90d3048efe76d9f5d4799b4f6fd7b7a..8527d30fab85e8501bd5be35270a7e8cb8fc0484 100644 (file)
--- 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 dd421a12513ff5f1eb4618d36b3646cd839f9531..256080a506169d95850aed5cc7a4a3dd3cba712e 100644 (file)
--- 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 d5d17865410c17f0ea34be95df73731b08b7723f..0baf3450dfdb93156ebd73dd93efb4a3c968a263 100644 (file)
--- 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 7671d52ed3455937d7edaaedf90895dbd5f3acb5..5d50c9f3147a8dfd847e6b22daae59bb03eade39 100644 (file)
--- 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 c16f88fe95a98f0f58b7f4896350ed4b74c6bc9d..69e02ebcf657fc13d41579aee9701969967c7d87 100644 (file)
--- 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 d1faa7514fc5b1109c874cadc8820808d973c91c..79dcde2363d600e9fae2d1de3cf8ec7601e13c24 100644 (file)
--- 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 ccd261e5602dfc3bb87bb06caf00b4e57830ac1e..8a5c00e07d365e30f8149f8946bcda9ef063cb6a 100644 (file)
--- 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 e648d9304fe5e00052d981d529fb17de873c3485..7fcaf60630966fd90070bfc69c57a28fcad9a32e 100644 (file)
--- 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 6d94efdfd386f98f3f0300c1a13b48c791af73df..d80f383f533bd29b61e3e9cd78b2fba4cf5bfec3 100644 (file)
--- 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 03e9a825e1279b451c3f2436c5edbce4c07e4370..48fe63bf112e1fde62cfd1ffe2ecb13fa9e7d56a 100644 (file)
--- 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 93489dc56baaefef9c56361d5dd98b8a55b67bf5..3158ac50287a308681f8268567a2073e21c0455e 100644 (file)
--- 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 a65b9ed65d8851af22fa2073f0bf2d0741f984da..a3e045f21834937d4b2c2da540530ecb12720924 100644 (file)
--- 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 beafec56d7e886866ad1010fef51de2422e9491c..ec8bf79578d10274f80c42ed3a31742a080e89be 100644 (file)
--- 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 fe4fc2c158939251deba247dabdccd27453989a1..345a1813cb30c95c08315a3205821da6b4120852 100644 (file)
--- 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 9dcc42f811071efcb4586ac625b729c55850229c..7b335183e9336270d3aee3572bbeb65d25e18e69 100644 (file)
--- 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 bfddc71e867158ef3218778b9e0f958d836ae354..dfe894ef89c22c8289e585b269a0e1ce9a0e31a2 100644 (file)
--- 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 32a3bde5d988c7378d7bc8b48c4141e9242520ea..5498e2beeb4a39c9c9f5efea7de4620b3f94a6a7 100644 (file)
--- 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 461c265ba2ed8e0661361dd1d73f6c5b0a29b17b..3f2cc8c9618ccd40bf15121852ac0a6f8293d8d2 100644 (file)
--- 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 81d0b5ddf5705725461e72a2003aa4e43172abd3..d5c86caa5a97143d92e1d0a5ce86d722e0a4cb64 100644 (file)
--- 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 0b78d4e0c41a5eb425057a490efec2cf1cfe3199..ff780c145d672076518eb8ad8b12f80f7ae4e9cd 100644 (file)
--- 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 bdabf6afad18acfd2fa9c246716d2f4fd4700dd4..2554e0a6c3f509e08568c26c01ef339165da4673 100644 (file)
--- 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 17d60789c6ea42554d3ec5613f886c73a57b3a51..c23722a3b7368837e379beb5a139fdebbacf9181 100644 (file)
--- 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 d9d20fc936cad620de174382b58e2e451a53f99f..b8bf04d290bc2e3031c364d9441569736275c08a 100644 (file)
--- 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 5d12465b3d0a2771761c847a5e0d61f8af2590e5..4d63ddf84c15af3f4c0fbf03712847777d5c57b2 100644 (file)
--- 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 d7bd3c1b167458f00f91cb429cf35e5311346bf4..e19bd003e9bde3e8c227d34a04a4d92e206a693a 100644 (file)
--- 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 4dbb06679ceaa29ed6893dff9cfa0512b6650aec..483d05062a1693256404cb5a1afdc738d0d96450 100644 (file)
--- 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 d813d9290af8e75aa1407636bcc61d342b0f32f6..abeaafcf1ab2dadfa9ae557a14198dc6e38d8e48 100644 (file)
--- 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 2d51bebfa20b19c95b51c309cf96c7f7480de6d8..16032445bf4f0c3920589f8fdff5503a6e050410 100644 (file)
--- 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 38a83914418a7779f5fa525d2114d977baa60740..69099691629e0c54c7cc8d04dd0185c940504932 100644 (file)
--- 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 dc68127ae13a9a71a2543c9dbb76f8bdbebc43b5..92a2dce66b822b9b24eb5c0535a20d225bb54b20 100644 (file)
--- 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 138dbe0a12b1c57a08983ac53279d9ba0e66bf68..688e0e98bd9863f43474d21dabaa7e0d04279997 100644 (file)
--- 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 069e8503347d22a92997cb41eee167ff3370bb1a..abc93e7ff95d010aa001d4df66f2d4fd6d619d42 100644 (file)
--- 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 298ad7279db156862abda1ecf329fb1da6ea0cf6..3e5661ccba5e9e3969ae4bdb4d96f7f7fe160de1 100644 (file)
--- 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 b1dae707c0600af35e4722a36649f6e5d343fc1f..f68b036bea75118afdab329fac9bcd6abc843e08 100644 (file)
--- 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 39db8c80096bcbab4450e5123a47d562e67d566a..8b8d74404da56265f1bf87b754da2c35f65bae7d 100644 (file)
--- 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 36cf87223f30b64cf965aca7c89a616047560663..8e5af4e580fba013c1ab97df65326e45f93237f2 100644 (file)
--- 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 f7855a678cd1d132b3f598ee343b0e03baa0ab94..4ac979c0d7e54b78f0aaf5e11ed67b0d0e819437 100644 (file)
--- 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 8f4a5b68843b5fb423c8c1228bab6d42265e2785..91f74538afd933a0e4bd3cdf527e5c39bc42c00d 100644 (file)
--- 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 e42df517ec6b11cf57648974c5506dd302a2e860..56476a3d5e4e38b1f3aafbf780f9dd34c62858b7 100644 (file)
--- 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 d1c425b4710842b1d22169df9d1fbcae6da54e28..ff77339c71710ec4846fca85d60f43cf4fcd9485 100644 (file)
--- 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 0ed97b4efda83791bcc8e1c007a10a7aea4d320b..a778c2f6a3c7da5e63cc75ddd4e2232f52d4956a 100644 (file)
--- 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 0b6eeff74678a16a890956cb860f72f433e6ea66..f5be03e9dab85883393460829c82582618bb1da5 100644 (file)
--- 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 f77f52f69d90166988516bc064ddd3672abe6b8d..08a67228ecdd461c41c3592bb7a3a6e840a58247 100644 (file)
--- 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 1eabae91a2885c32388e37a4fc25f8516df72398..67f21c0e17a1398994ff7eeba012421c4c357dc5 100644 (file)
--- 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 59e1ae918dc8fc2a7e22d3b6a1275adc0a7da127..11e4523ea1c2f8941bed5c86febf99bc430abfb7 100644 (file)
--- 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 77dcca3b2982855122bd01b53173b210bcf8ec0e..054ab7d67e023124e93c632ab473b5043da66c6a 100644 (file)
--- 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 be2f5abd238ebb1d90210c5ed240231fd4ff7cf0..8939dc75ef431d1dedaab823e5185e3740a7efb2 100644 (file)
--- 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 bb4519ef80f541070cb5f095f53dc9f1f253cce8..62a192321c22daa5c6aca40cdbe2a1ee267ecd35 100644 (file)
--- 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 644ed6b1f62aafa907b1a661b22aaada377010cf..944c517eafcb6389e5b7d0ece5e99f866cdb7106 100644 (file)
--- 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 7396045baf904049414527809aab51610b9576b0..5a2f50136e57939b4bb6039dc15756b7d06eb110 100644 (file)
--- 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 fb959527dc6433c53706fe35463d004dfca5b9dc..fe62bfddf1feaaa06bcd3e79734645710351312c 100644 (file)
--- 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 40ede04ea4e3c858b4d5e4ab55ee1d1c7fdb96cd..5713106ac77d55446d1d0d6f9c82ce379c5109ae 100644 (file)
--- 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 c5d5d4b4e2fbe506812375a77ee3e6eb902d6262..e48c69648c01f087d303e40c2eef189718de9751 100644 (file)
--- 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 720cc40735624ca006b000ff914733367aec7301..25de1af2937289f9653fa971799cf746ecfe1b8c 100644 (file)
--- 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 6366cd0ad452c289e16f445551f920aaa9ac2433..257ea82da437d035cd9fba01477c93e8058f0870 100644 (file)
--- 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 7c0a066e92776eb6fa6b759e543315abe1e891ab..9e16d1db61572c911ac3f5c518beb0ce039af456 100644 (file)
--- 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 d1e944dc2d29fb570802ab2fdcf8d01505627ab2..42ea1b1f6b2e190b7b38c56743b49aecdbbf66e4 100644 (file)
--- 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 bb134441b3781e9e1b4c06778ec5632905a9c973..e99d29f71be9ee323283bdd51d979e2f8d3bee39 100644 (file)
--- 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 86f81d837d8907a09ca1fa08c1df55d990e0b0e1..e09ff0e761ae0a190b2acb2d48f85dab72432df1 100644 (file)
--- 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 93c27241d6179e63837d92531aea83411bdb7ec3..b9512dca1cd2f87cf4318fd305be51a4d66c84f7 100644 (file)
--- 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 2eb7bb60b03003337fe82daff577bb05484d7097..461acfcf33cc60b2d87a6d1fcb8de8c688d7dd0a 100644 (file)
--- 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 40187df775705cb2b8fed8ad0192bc1308d96598..10717bdcf49295f5a40419bd35e44b91091f7de5 100644 (file)
--- 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 277328ed46aa4a1fa580450457e29f77ce5ad83e..3f737f392b6b0910fd4cd49a04d24d423982a3f5 100644 (file)
--- 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 7eeddd2c4f72f4bb4bdbce6321d75749a1a1913a..00958b9a33c1c2f63ae63631f1060119577076d8 100644 (file)
--- 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 31d9339a2f1d3dc30c7cd619ab09ffec8954ae79..7f40efb18dbeb07af7a1672d4dfe852237b1a5d7 100644 (file)
--- 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 0103742f4016937e699e436b7db97cdc1dc97a99..98f5660b7c05e14c77d92607323523b0a4749b12 100644 (file)
--- 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 8cd201862aaf84ba8dc20f30ab2c24f895da7dd7..56f50118b4623b11f94fca0ceefcc0273cc65824 100644 (file)
--- 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 e1f545aba7d29ce8455fc30ba20bf80615d31e3a..6241af0032cac2404beed9fc031c54b3112be0e5 100644 (file)
--- 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 b07fc54cbbaf3a258ab5e65e8c887de583962711..2c98b99c588b50a3833529d28a7a31d3898380b9 100644 (file)
--- 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 3ca06f87fda1855cfe4ce9493a92ba80fe46626e..f4f3990e255de8364fa456af375542f945bfca81 100644 (file)
--- 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 d7dc87314665476f436bda79d689c1bdd480b3c5..629f9c40d23c94c922865cd4599e38832754045c 100644 (file)
--- 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 6d6d9658a2e63db9a2bcf9e33fed053bae33ccc8..c8bd1f362f5bf2696a5e5d159ccda8e012bc6a98 100644 (file)
--- 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 3252b461525381bf79c126fd3c34da6cfa849b1c..c2019893a1fc065f879f5987955e14b85ccc70a1 100644 (file)
--- 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 4d644900993e44fc111d61b2735662146dc23fff..0a49f221d16984ba771c57bd3b1de078e172dc25 100644 (file)
--- 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 0f324da1d4c37e266deef221452bdd92519c63b0..a999c26426c6c13b45e1bcd86ec247a9004fabf1 100644 (file)
--- 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 51633d997b70055d4854fae20e28df641b5ba2c1..ec778a7fd5fe3a0c66ef7cfff57fd706f555f42d 100644 (file)
--- 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 aaa21d7302a5e6e783e74a1c89eaa43b1d882b73..65416e8b4c22a0044da5f53b75a7df15c532a02d 100644 (file)
--- 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 624202e6526aac2626c09c25302e9c794f5a4f19..e73eda67b9ba9461203a7662eee7341cf6bc770c 100644 (file)
--- 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 129e5df4c1a6f76b46ef3ebcad58577287ed5bfb..3047764bba3cdb909cb1ce2df971377a33ce7e39 100644 (file)
--- 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 8f44d3c3403793f6e8309cde878b9e620bccf312..a983e071a85af619159c599cbc8aa2c359ddf998 100644 (file)
--- 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 481aaa7ae7aa23d23cfc5efe3fc6f46ae448e0c6..85b4f894acf29344763be89f1437635e573f7694 100644 (file)
--- 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 76f8985524c97a6e27c42c76fcabab38adff8ec8..b52a2e19556a96cd159dd169c431d275264f9d4e 100644 (file)
--- 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 f9d5bcbb5d7f8b1a26a68589a410f4bbec3284c8..e126d8c7e86cf1d2581aef0683b50defad08e82a 100644 (file)
--- 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 78701a9c5dd64bbefa80d0a9aea7472ac9ff9ca5..066292d1c0951d0e4adf924c4fbe6a9ac5a60d5c 100644 (file)
--- 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 6529028d5089f4c80d6d09b0220b096b84dcba83..5a99e9bd1eec8de9f5a25450a2f5b0feb0bd36d0 100644 (file)
--- 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 d373f477c2a21b18b502ebfc653fdfd98daeb9fb..d3aa237e97c9c15a65a544bb06c598199f421778 100644 (file)
--- 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 651d070685d1b3e4984e96cf88fb4db7e178bacf..939bbeaec53db9bdb26b741f136259d29efc0747 100644 (file)
--- 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 1c4b51c508ee31f229aa764e2a59f21736bdcbd7..61a487775a3080e2eaeca558767cf22fd6a3530b 100644 (file)
--- 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 b00ee7497ca71189210c16e7dce46872c44ec423..c4353bcff5c121fd5968542b5a4bc5f5205a008b 100644 (file)
--- 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 aaa9809410b1eee27b681625309b890735210a2e..1a37f4100825cf9c3f2914ff73ee357d253cd4e9 100644 (file)
--- 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 fb53d6d69f5639862ebacecdbe7b41a56c237f82..0f9ef9f4b67b9ddb5a5f0fbeff4142e0cb35e985 100644 (file)
--- 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 03ea43f83dd387132838208960391c548a86d92f..4cb670206642bbf44914142925f0e375f88368dc 100644 (file)
--- 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 78b1484c76917a4b9c496f3108fc4ad153176f9f..f24f02bbddd4e1f52d808275d89ab59363aa7f9a 100644 (file)
--- 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 6b6b8c093ab6aa945833233696a72c4c829a0e53..5081b497e5b4ee5ee0c461843c31630a818f63ff 100644 (file)
--- 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 cdfe7d532864f5f6ba96c0c38181b646f1ecfe06..34855e224b1f9063aa50a6a6f02e04dea1c550ab 100644 (file)
--- 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 2843442762548928ae052fa25169c4675933f2ca..1cae0254ce256be98279b2901e5a7521695d584d 100644 (file)
--- 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 164f32788143204df5603d95ccfd8ef19e4aabbc..dce134ef7233af7b900920222e84070513d5cd3a 100644 (file)
--- 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 bd3391b3a5daa29e89657c65c7d15a753ad0fe51..ba8c0aa6ceb07cc61cb3d93ec1e0ac657d86eb5d 100644 (file)
--- 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 2f1216b1f498347661f1ddf7f13a6b1e1be9ca91..a3d14231b42d53c85e7b5a1614c480a5bb467f2d 100644 (file)
--- 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 90d1f933b14de64e4db30ad4a25ad538bfdfc60b..0bad1f7c2203b91b8eded20046d1226b8b13a7ba 100644 (file)
--- 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 ea2f1dc28df77c5b54981788c1e00e784b7d0543..1a26375154edf2e07e3f93c50d788307f04a1056 100644 (file)
--- 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 f66e6b818209d2bcdbd233dce3fbf313e291f730..4d67fed7b4fc3de2ccffe8f12a16855016060d3e 100644 (file)
--- 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 0af3202a38a8f5df7c12b0cfb07374775f5e293b..983af9bd43d63a29401373a8c11d2e8ebfc6f872 100644 (file)
--- 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 c029d0d71b7f08b215e326e95da1bf9a11428ab3..7ec2e805fdea1ec21d3c0b2e5ba17b46289dcb6b 100644 (file)
--- 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 b7fc3fd587fa7454a89750ac823eabc03583a578..c1c91d51ff710e334d05bc44828918515fffbc2a 100644 (file)
--- 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 e71a01c2d8706cd2fc44e7f86c5b9e49b0b0fe2e..02b537032124b57299cc21952dd0b8ec0a0a9890 100644 (file)
--- 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 9d0dc5c905eccc9164a432591644c6cb18f5a2a0..542978c83df0c4e137c657dadc22c51d6126f600 100644 (file)
--- 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 903b4ca7c83db6054ad2e065e0cb468fe9d0344a..af74310c8d9e8d3153106aec706a3f682f83581f 100644 (file)
--- 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 f8b9c69ff8f95f88df23624a38976fcd8ee203d3..75147a3639e19826f02fdb6cd6ad7731adbd4ebf 100644 (file)
--- 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 6d12ce20bce143e8adb0d0750be681bca8a3adeb..99c2608e1c7ae8eb21ccc9c9bfe33b4d0bf86e44 100644 (file)
--- 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 5ee5cdbb840370242b85d09ab661a39b64f212cd..b0bcb6548908fa7d753e326cbd3bf7dfef48bd47 100644 (file)
--- 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 4af033ca9a1e873463737380daff2f2dbf30a8ae..c76363eb33e6b1e3b5a25fbc1e662e35d42f5123 100644 (file)
--- 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 2fcaef96143f8f57b4e6d3e07333b23aa3ab992b..01f1ccb7091f5ca6c52d904d046b2ad68b09deb9 100644 (file)
--- 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 2c103ff69a5ccad61af6ae7b57e99b9f173e715e..7337a4012081214af8f68a261e197d8a3e3ac816 100644 (file)
--- 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 90e8a0245a8ffc2ceffb997f514ebe9beea0b00a..ca8ef3953f378b670fdf0c5103acda4f99b20767 100644 (file)
--- 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 d08da83417756008154c2a3080caab271f608b03..1c0f675da31d9b6de00972ac166a52d567bb34ca 100644 (file)
--- 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 a94295a986f1f7ae19a025c197a6d03e338ab31b..3608eeed2403868046d4877eb004e2902b90aa63 100644 (file)
--- 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 362d6b5490a3c225d22b4d55db48279ac59e19c7..313aa14a6366100575249f910c8c3ebb188c5175 100644 (file)
--- 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 6c6ec7477c2f99c45b6a636a1fccfda71ea1196c..4918700f9c6f51f661814d5010f893d77002ccad 100644 (file)
--- 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 4aca116e5dcf8d6929c139b4d336767e3907d765..6f476e5002f63d26cf68bd6f0a2e72327c565a47 100644 (file)
--- 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 09d563329648f0c14c2ab50b0ed9ec2acffbac19..0ac7758f8579e0a4e9a8bbe7ce471a91e1b406a9 100644 (file)
--- 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 6c2b688ecac33cbb84b3e4246af9d2bd6fe95c34..d10d12bdd5ac87deb80394081f8ca1cd1929bacd 100644 (file)
--- 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 ae1b788194c417263c456c0b15746b41bed5ef0a..09e3ed89e407ce423f3d9c7169727e139d0cacf3 100644 (file)
--- 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 ad31830e0a3e02e47b184d282b35673746c4e84c..e4711e049f324b575b7899e9dca71be2cccfbe2a 100644 (file)
--- 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 a9c1babc02e98e25f6636d0b5ff3ffa19c4efe68..98ff7bf583f15651340a459055e9cca2f8dbef78 100644 (file)
--- 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 c7d3eaec0307dddfb912631e16c74d8657ce6359..646f47afbb17fbdc403fe1ed2047664e410f649c 100644 (file)
--- 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 dd38fbc49b2153a5ee81eb23a519ec6d7eb97935..8de0b83d923549e44d8412dd474bef1bc422a48b 100644 (file)
--- 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 8027cf4823781dedd3e8dc3813762a4a7cc017bb..fb159a7832fa6e55e56e190537848466565482db 100644 (file)
--- 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 dc1a394b0a4c3f82d031fab9a98676a03ca214a2..589686a38d07447136aa0147b3d6a6a364634419 100644 (file)
--- 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 351cd802a06892bb955672771c4f3a4fa0cca875..8819f6230b3ae0efa72f581ee7fcfb19a2ccdba6 100644 (file)
--- 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 f3b225c66f83ffac6a825c4156919da09603982b..74c41e72a8fd30c23dd7a2e823278f33349fc266 100644 (file)
--- 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 aab6cdb5404e91abdc2ec6cccc2d631117a322a0..da39a89cabee25dfd4ad1ee59ffcec58b1b66a8c 100644 (file)
--- 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 981ed16c344dd25d2bd20f24b34c8301d7193769..d24fca96c2a945dd12bd0566b702a3fa9d245011 100644 (file)
--- 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 d20db5f2f4bc3addb843f5688a2bbcff75c485d7..35cdef19aab5d1aa5c0d22336fa86476cc1e406e 100644 (file)
--- 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 17a1dec10427d935a377bf1bd6bccf4da8b27151..580f6931e01daa721a5de20608751e6f1ea8a7c9 100644 (file)
--- 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 36a2ac3d206e0e53080c1526a8e01e8912912f74..2457c40337d215162d78a9424fe42065d4db38f2 100644 (file)
--- 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 cbb2d4dbbf48fffe98363e3d769982a15ae79db5..cc991b2a3e9a72cc5224b6814c05324900a39d44 100644 (file)
--- 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 4909db849d90d7c69c933b6d0c1fa61304cd1b8c..2e499adf3959057e14f6c308ee407e4922d86436 100644 (file)
--- 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 9415855d7008230b90b1f04bd385eebb658a1a79..9e86b54119803067838aacdd008f34f6dd50b6b9 100644 (file)
--- 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 9eeb4cc9fa970d25a6e1943428f6f40f83688064..a3143a0c7be817cfeabceb8c2151c99513e36b40 100644 (file)
--- 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 0af86b968f5929120fc89889710a741fbc4a2492..f5e29e446777b92ce787ed9c94f4ec9910a7158b 100644 (file)
--- 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 e50c5de0e0b86d225e3760705c407c2898b18d95..3842776a5eb215e40becac500ac13465285655c4 100644 (file)
--- 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 1dbc83b61979181f7500d6b7fff17d0d75059360..7c2ca9dc2890b2fa40498e577258635734678549 100644 (file)
--- 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 004f795f51ab6ebb4ad81258bb5f5034cf295f37..7960c064d7be0bf734c0f70fdc612f9480f88be0 100644 (file)
--- 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 e451f81fe1bf9a542d1940e4a7e19487e2b14657..d526f7710beed69ffdc32dbc22c13b6b4e406d7d 100644 (file)
--- 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 1b4465bddeeba001f920224e8b9231554a9aa7e1..d5d2ffd577f4c9a4cb8d39d717d48133ccd1ccf6 100644 (file)
--- 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 cc661f78b4786612183483200b87ca7cde0ee406..4692b22b1d1e561b1b6a505ca81b1223e02ada44 100644 (file)
--- 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 2675665617ad89efea0581e7d812ab992b48a9d1..984aceba9fd055151afe72ab69a4ba7941a45f8c 100644 (file)
--- 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 a818257f57e530781ea13e32f55f29b8cec24c76..d7c19f14cad161c0d6a057b09868eb6dea63c767 100644 (file)
--- 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 3c2b1aae14794d03df769a7c3722c0cddccb19ce..388c53fd0270e8b46eccce0d4c922866765aef80 100644 (file)
--- 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 (file)
index 0000000..654ecbf
--- /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 65c6c2af4adf036a2a629508b6de85a3e58290b2..58257e55eeed59822ceba5282629ab54856aed75 100644 (file)
--- 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 e1ec0853efbfae59478f0b80623bd404a55f6de2..2f658c4d5d6e65b3e9f6f3bbf70760e73249252b 100644 (file)
--- 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 b9235339773b0913d18ac2995cbe285d9f3e18f4..d212e98757d6c0d321ee5ce61eb03a18304dc4c8 100644 (file)
--- 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 7f1b694158a0e8e254c62aeed9ddf7cd43a313d1..6ee5ac654ad541ef82a3bdf9f3729f0dfd2e306d 100644 (file)
--- 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 4c824c4b41ecabf68a6614a4a777fa69afe6f1e5..df1540cfb523dd6e336c64b30034b1580e684256 100644 (file)
--- 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 2e299c7dd9108a6dfadaaee7872813e10ab62eb9..ed465ace40c7f17d7c29952b202ec5aa6291f8c2 100644 (file)
--- 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 c320b256938c5c0426e02024002980b3022e87d6..0310653593ec90960d84c99a163afa50c7a7b3f0 100644 (file)
--- 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 e4ed6779b3f1c8d03083215cbb8fca50972c3ef3..878f4145d331fa918b7ebc47540f04d6608c6749 100644 (file)
--- 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 f0a4518f3c3968dc87b7a0e70947fadebfafefcf..2ddf2a888101babb3a29756ad41f6f798c0a742e 100644 (file)
--- 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 df1e4889146929ef946b9644d760be75075ff8c4..6405a87254692305676df97f7d4a622916e3a30d 100644 (file)
--- 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 6475fb7fb27af040d9917e66647600ff8064a6ed..6a322ff502f81aa00e7ae7ddc1fc76e0edf81465 100644 (file)
--- 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 c3eece620b501afb320798bde6ad0b0467cbd0cf..0ce5fdb98c8ab4c38da31e800d6c44281bca8ad5 100644 (file)
--- 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 4cd622cef85ef9a10c9cf2c443a009abc2f76c29..f40e8ba83d7ea30ae78e2f3be8a72b0cbf308de6 100644 (file)
--- 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 110bbef22402507600120172c35a31ba8790e2b8..442f0509cd256cb0bebf49d8bb0a6ff8566ba6e3 100644 (file)
--- 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 d666f6ac2d2c3c745259519fdfacf42a6e7054a1..db46a6c6f96e50f077419753d160ceb6f612fea4 100644 (file)
--- 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 1f12493c552d3ecec05640f7cafca4e9aad9eb63..0fd5186acdd9b7c200231bcb31d139b8b8d65e27 100644 (file)
--- 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 1a23887b361ee6ce3dc56b6f08996474191cdbe8..d81f160de1b7c3057e2b57ff89a3187f59c7c6cc 100644 (file)
--- 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 a50a875cf735815369df278852ba250a03bc4e68..ec7c0011fb21f70605a647605890d1c28d3509ff 100644 (file)
--- 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 98fdc07caba0d36362f93c090fcfa8dd36850014..01612ef729885380e15356e83150f44e8bef3d49 100644 (file)
--- 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 bd2cf5a6a3a8463eb8813599a0504d4a250971b3..5d26fd033eba9b519e5489d5229b5b845215903f 100644 (file)
--- 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 c1b93a2ce052a80c715f80f67587b777b8866389..926b09a57aa4da658f56f389c4940a90d3332656 100644 (file)
--- 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 9f69adca272b61c5f55aa77b11c2e0b9ba6246ef..907ab9947357c73540fdc94e5caf08dca0aef273 100644 (file)
--- 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 d5465e30dfeb821c7c6aec13d28b7d61943523ed..677bc9ee38c6bdb95ead3de5c58a2deb40be16ea 100644 (file)
--- 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 5e156d486a8e2c180e793a37cb132f5ba9e42de7..6ae1514e9ec3848e74620c1c99157b519f275232 100644 (file)
--- 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 a9daf05b743b0ab7f091c05aa294251eed98fd91..5a8571f09b6eb45dea79fe3df30c13e2b34019b0 100644 (file)
--- 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 7cd35f0e27b74a9324d0da4c8fb1c2d05a3cf9bb..d37523c8bb8fc6d098e5afc9338c0e6317ad34db 100644 (file)
--- 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 c77c1547f3631142b429eeb5d56a3d76d2e1591c..7cbbdf01776deb09e1b3c52e82b85a825e13a74f 100644 (file)
--- 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 5cf1dc373414dd0a00107dee5968034ae3a070e9..1f96800e3e41e3b00fbf588206c52038f32bac5c 100644 (file)
--- 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 5db771d13c861f87fab86801c9767e3013d56812..c9720e46a35a66206bd3627a3936357107225ecd 100644 (file)
--- 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 eb9d2b487fb2f1b26676c96d33d815d8527031c3..e5fc5393d4846fe92258a2da0144415cbbe80e21 100644 (file)
--- 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 557479dc9f20e290b69672247e3f4d4e0c8647b3..17d5ff2d1b1e54fed38e80e5efaa8b1738caaff4 100644 (file)
--- 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 cdec8306bdb256def5c335299ae446aba87b576a..f05eedb0a918a8fcdb71a8d9b94ffd3123263eaf 100644 (file)
--- 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 fbd83769c6b0d8fd585cce4e18dcadb601d19ffe..64987c8c0327bc461c78873b3d88f613272d5606 100644 (file)
--- 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 65e1901f6f39ebfc09156b11f20b99e5bfcaddd6..148eb7ef04a8a9e938562ca7151db06571ab213b 100644 (file)
--- 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 4d90a9cd7a949e9eba6d8cd4f1ce17ff38de5513..7329e28d1443f8c7a39f66b3983a090d6b1e14cf 100644 (file)
--- 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 d5dba1b3fbea7ee7aca65ac25f835fd3a31a3d48..aedeacf2f46d62c1b76551d8407cb6d2c9003ce1 100644 (file)
--- 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 ee48a51b334073bf36425bd47516f77784fb6757..41e71486f9605b7f88186c898e6a580db6fb32e2 100644 (file)
--- 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 4ce79253dbb857ec2518653eb05aac51c48eacdf..3f8f4fb629d57a1f0ca1da994aed56c4e694c9c1 100644 (file)
--- 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 e4085ad6c318746afb55322a8fc84a4976307b0d..d672ad4931880377ed819f0291d1210f680b1333 100644 (file)
--- 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 bf8d1d4c5c2f3252953cb3cf06d909edec165de5..46b7d69ddc22e533709da38bf00ceaad6f54cb6e 100644 (file)
--- 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 6b817c2f44e097409769dcafc76a35c2297d6230..d94e70d7c2ee21911485b0462214ea2763cc9c33 100644 (file)
--- 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 b8c8086b632af06e27da74c47c568248b1f9749a..161cdeaeeeed1280c384ecef0d07ae8576ffeee2 100644 (file)
--- 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 14f5c6249816c44895e03d7e94d8e35b92c04b15..7de4a6dd58e4f57a4facb260ae628fefd27b6d5a 100644 (file)
--- 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 44feae7bd70f635a27953c206a3b024fcd5e84c2..b50220887324b68bbcc412b0275b6e4fc6644a54 100644 (file)
--- 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 160f9e0865e7fd48bb9b73b7aff55052cf4fa522..f453873cb01eb4a66e35fd167846bcf310a87220 100644 (file)
--- 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 108d93edc25f4e93ac92af9c9788c749becfcab2..e4d02b74b2df3cd3e74123fb04ad5ebd1b0b5640 100644 (file)
--- 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 35c2a17b26ded605a767371af4d0a3b2cee2cfce..f865057fd79de210ae18a5b8ca46b436cdd64969 100644 (file)
--- 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 3f8c401de5aac57152bec56c153c2cff63b7c5ff..6c3aaee8d2158d39fd498da92b2f87406b89045f 100644 (file)
--- 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 68cf703be0da12e324e9495604df256427ad6649..2419dece46e6eb6220bc0535c2e59ab7e0f73eef 100644 (file)
--- 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 39e3bcecea4ff245a7a0d60d6b44e52fcef0d516..4a8d38aaef63f3e07faa073e3c936ab9a8428694 100644 (file)
--- 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 53a68d31efb6795399673b1b2b943c323d4770af..397e4e94de13bc99f54f0164f699156013f00275 100644 (file)
--- 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 a62f7c6a3fc447ab32ab66cf79a45fba795ce48e..d80aaa8f1febcc436cb958ae445b05745b2d3539 100644 (file)
--- 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 334ca0cae21c23f0a155a97782d4023d49887a37..cf124eccf81cd1497464be36b3088b491e8f42a7 100644 (file)
--- 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 8ded6c27cf799175351f298306ce6aa0ec78df20..a2c45a327d78a2e698d8fa368848cf3bc1e4b06e 100644 (file)
--- 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 e68111eb7aecafb168c6f96b032a459a508c60df..d4aaa441b40075f6912635e5c05966fea33546e0 100644 (file)
--- 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 e68111eb7aecafb168c6f96b032a459a508c60df..d4aaa441b40075f6912635e5c05966fea33546e0 100644 (file)
--- 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 3f49ca99693c2d94f0674c4528ff04e94cac20be..770d8cc62d8d9a4edf32edefbb66502624846425 100644 (file)
--- 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 e11456cd28bd9089ed19202f6af4fbce90e112a7..a5b7f2cd05927dd95fd2a2b2d08554e77ce690e9 100644 (file)
--- 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 d945999a6871577e6878a6e3fbaffef3855b0744..8c5864b9a5f48a38017d4d80bead453e72ff637b 100644 (file)
--- 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 4e90606f2d9aa22a56098fd6363234a37fbd1b9c..9f1058fb1447f97fc31ee48d90a971af378e7e6b 100644 (file)
--- 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 5b1175a530305acaed621b450bd3a645b3fd55b2..26906e7c74a5b0c8d6bd018921efd60967fd3527 100644 (file)
--- 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 86d8b6d8d7f0df877f9e01c3041712467c9367e6..04cc37082863b1f45da3d80bc99ff28a03d07144 100644 (file)
--- 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 db8c7dc1f92be4cb664371d5006b0746b9ee6500..7bf79ae383796834b222d60ec6353803f4c8045c 100644 (file)
--- 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 763567326264589c79337e46115b0ac71f730b64..5aa96819fa7b70c5126a5e40a8b4b87c1007a870 100644 (file)
--- 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 d5d497a06f7a44d38f2a34657af2458667e45243..e5a7ef36280a5d9eb822a86e9547a4681cd193e5 100644 (file)
--- 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 385d4fe084a7b0d860549492f24422924ab5c671..17cba3c99d8d4379f9e9c78ceb0e7319d47e59b8 100644 (file)
--- 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 98f70ee6d2422bc036955d5bda14516439a40599..7929b406fce3f9cf6599b7f99a5b91cbe886e14e 100644 (file)
--- 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 027ba7a54f45ca493b3c584f3594053146652723..1e904d4885516c995e2eafc2fa614eeb7f2bfce8 100644 (file)
--- 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 4258a727f7bcfeebcd2081de0b5ab4da2e9d77b3..af6220121d2503ff067425b2166629ed5dee6970 100644 (file)
--- 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 1dbe3e4663bb3a5882a5bb24b3a837e30ce37ab1..1002009f5ab5e7ce05b3631fd0da163dd1325771 100644 (file)
--- 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 cafd2fb5e71e0476ab06a17159027ec12009d957..d30bc353335fa6317d5df021908b750d306264c7 100644 (file)
--- 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 f273d92fad252218067cd7d8b5ccefe6a271a8a1..2af73f24419cdc107f4ef376082accf8e46f5218 100644 (file)
--- 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 40f4c8370ef5c64decb80bea36b3c58ba2d83577..7a1f943a6873de99f2ff0cb75422d8da24dc8cf2 100644 (file)
--- 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 e81c58e9840a6f20f19e1a0b2a709c86f3e63408..a6812213bc5dc07a95c61dc106ae33e26eba3a65 100644 (file)
--- 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 bfd32bb3bc0954bda45ee9525a7d9dd0adbba121..9465cfcebeba718f87e0ece03ca9155e1f0f1913 100644 (file)
--- 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 1b25be1f8471ac0e52a235e41a1e0e98b4f74172..91dc4275d3fd9d9246f38d95e09e9df45fe2458c 100644 (file)
--- 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 b65a2797e4917832656a65bf5a1959e601235ab5..7526b9cc40b7f4575cddbee9e7c3527d54516939 100644 (file)
--- 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 b65a2797e4917832656a65bf5a1959e601235ab5..7526b9cc40b7f4575cddbee9e7c3527d54516939 100644 (file)
--- 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 9ba6350cce62a00710166adec80b1388a286b077..09c81ffe90fbb8608dca0b3b8256b8a7718a7fc5 100644 (file)
--- 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 840b74ce0ebaef001f645583e25a46e11ef29238..c484282327f637ced7361748ec4d591d8d7483f3 100644 (file)
--- 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 1e3ed5a1e0996bdac6ace6907e2491487484a3ce..0e5e27b853f65d25f7298e242285eead7a209089 100644 (file)
--- 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 673ec66567fef9150c7b2ddf91ea25bd9764432c..9ced25da422ac8171ca64a352b31593197d8aaa4 100644 (file)
--- 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 6fbd7c12af3bc5558efbfe1c78a9f5c661fb1dda..325ac885b58449000d21bbea01acce92e1e9085f 100644 (file)
--- 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 0279cf10ef02dfbf3fd5541c20e92e06a27831b0..88c2298023687fe7ae5501e3eb7a7a4ce46ce767 100644 (file)
--- 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 32423f137d634917a2a7efbe53ec9f4e4ea3dd73..5dcbcb5bb0758366e029609ae0bb75aef6ee1b52 100644 (file)
--- 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 ba4acc29f2b18cb93a933dbfb09a70926d65e7f5..ec4306b4757efc590523b2d58d06e6700d17832c 100644 (file)
--- 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 0518519b83287f93906d9a6d89b41db9ab70d545..a1f4ba3ebd9c9bbc093cbe07b3f9459260c8521d 100644 (file)
--- 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 66ee61edcd2d193b3a04a57b47ce1de88612d207..0b54c9675a4829efd3bfb454563d86bd0da368db 100644 (file)
--- 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 a01167ecbe6a68f1d283ccc21d8bbb1f68f2a388..ed83ed3de5a3d3620b08c7d56bb29632aa5d4cd2 100644 (file)
--- 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<
 

diff --git a/test/log/0584 b/test/log/0584
new file mode 100644 (file)
index 0000000..f3ab6ea
--- /dev/null
+++ b/test/log/0584
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 <= someone@some.domain U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted

diff --git a/test/msglog/0584.10HmaX-0005vi-00 b/test/msglog/0584.10HmaX-0005vi-00
new file mode 100644 (file)
index 0000000..540b683
--- /dev/null
+++ b/test/msglog/0584.10HmaX-0005vi-00
@@ -0,0 +1,2 @@
+1999-03-02 09:44:33 Received from someone@some.domain U=CALLER P=local-smtp S=sss
+1999-03-02 09:44:33 CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted

diff --git a/test/paniclog/0584 b/test/paniclog/0584
new file mode 100644 (file)
index 0000000..af4f471
--- /dev/null
+++ b/test/paniclog/0584
@@ -0,0 +1 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted

diff --git a/test/scripts/0000-Basic/0584 b/test/scripts/0000-Basic/0584
new file mode 100644 (file)
index 0000000..54ca506
--- /dev/null
+++ b/test/scripts/0000-Basic/0584
@@ -0,0 +1,8 @@
+# tainted data for appendfile file option
+exim -bs -odi
+mail from:someone@some.domain
+rcpt to:CALLER@HOSTNAME
+data
+.
+quit
+****

diff --git a/test/stderr/0084 b/test/stderr/0084
index 02d86cee1d51423a7b336fda97c733db3c4ee40f..8e4d16ee0cc8413c88f55e86e48cefc44fc7f25f 100644 (file)
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -17,9 +17,9 @@ file check: TESTSUITE/aux-fixed/0084.$local_part
 expanded file: TESTSUITE/aux-fixed/0084.yes
 stat() yielded 0
 calling forward router
-rda_interpret (file): 'TESTSUITE/aux-fixed/0084.$local_part'
+rda_interpret (file): 'TESTSUITE/aux-fixed/0084.${bless:$local_part}'
 expanded: 'TESTSUITE/aux-fixed/0084.yes'
-ssss (tainted) bytes read from TESTSUITE/aux-fixed/0084.yes
+ssss bytes read from TESTSUITE/aux-fixed/0084.yes
 file is not a filter file
 parse_forward_list: userx@test.ex
 

diff --git a/test/stderr/0085 b/test/stderr/0085
index 56c65f6b454f91b2c71e7f58512db5ce2ab67616..001ee066cb637d5271ab78ba22f67baa633e9582 100644 (file)
--- a/test/stderr/0085
+++ b/test/stderr/0085
@@ -28,7 +28,7 @@ y.z in "test.ex : myhost.test.ex"? no (end of list)
 y.z in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
-expanded: ':fail: unrouteable mail domain "y.z"'
+expanded: ':fail: unrouteable mail domain "y.z"' (tainted)
 file is not a filter file
 parse_forward_list: :fail: unrouteable mail domain "y.z"
 extract item: :fail: unrouteable mail domain "y.z"
@@ -227,7 +227,7 @@ y.z in "test.ex : myhost.test.ex"? no (end of list)
 y.z in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
-expanded: ':fail: unrouteable mail domain "y.z"'
+expanded: ':fail: unrouteable mail domain "y.z"' (tainted)
 file is not a filter file
 parse_forward_list: :fail: unrouteable mail domain "y.z"
 extract item: :fail: unrouteable mail domain "y.z"
@@ -282,7 +282,7 @@ smart.domain in "test.ex : myhost.test.ex"? no (end of list)
 smart.domain in "! +local_domains"? yes (end of list)
 calling fail_remote_domains router
 rda_interpret (string): ':fail: unrouteable mail domain "$domain"'
-expanded: ':fail: unrouteable mail domain "smart.domain"'
+expanded: ':fail: unrouteable mail domain "smart.domain"' (tainted)
 file is not a filter file
 parse_forward_list: :fail: unrouteable mail domain "smart.domain"
 extract item: :fail: unrouteable mail domain "smart.domain"

diff --git a/test/stderr/0297 b/test/stderr/0297
index 36bcfb48061f109a65a6d10223f102c549eef4a8..f1a0a2e2952a8b06634c55a86f0a16f6c4bb6c9a 100644 (file)
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -8,7 +8,7 @@ routing /a/b/c@myhost.test.ex
 --------> r1 router <--------
 local_part=/a/b/c domain=myhost.test.ex
 calling r1 router
-rda_interpret (string): '$local_part'
+rda_interpret (string): '${bless:$local_part}'
 expanded: '/a/b/c'
 file is not a filter file
 parse_forward_list: /a/b/c
@@ -32,7 +32,7 @@ routing /x/y/z@myhost.test.ex
 --------> r1 router <--------
 local_part=/x/y/z domain=myhost.test.ex
 calling r1 router
-rda_interpret (string): '$local_part'
+rda_interpret (string): '${bless:$local_part}'
 expanded: '/x/y/z'
 file is not a filter file
 parse_forward_list: /x/y/z

diff --git a/test/stderr/0361 b/test/stderr/0361
index cd96418fec494fa088bd1b491bd548958deb2fb5..8f5ef0b2bf626bbf1dcbbcad0fb7e52d8812c692 100644 (file)
--- a/test/stderr/0361
+++ b/test/stderr/0361
@@ -149,7 +149,7 @@ checking local_parts
 kilos in "kilos"? yes (matched "kilos")
 calling r3 router
 rda_interpret (string): '$local_part@$domain'
-expanded: 'kilos@recurse.test.ex.test.ex'
+expanded: 'kilos@recurse.test.ex.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: kilos@recurse.test.ex.test.ex
 extract item: kilos@recurse.test.ex.test.ex

diff --git a/test/stderr/0364 b/test/stderr/0364
index 1b08f726b8a389cd26e94abcbe6c40d62bc42462..43462a56f70fb236803ef10d006c2aad56d3b2f3 100644 (file)
--- a/test/stderr/0364
+++ b/test/stderr/0364
@@ -10,7 +10,7 @@ checking domains
 processing address_data
 calling r1 router
 rda_interpret (string): '$local_part@$domain.test.ex'
-expanded: 'kilos@thishost.test.ex'
+expanded: 'kilos@thishost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: kilos@thishost.test.ex
 extract item: kilos@thishost.test.ex
@@ -55,7 +55,7 @@ checking domains
 processing address_data
 calling r1 router
 rda_interpret (string): '$local_part@$domain.test.ex'
-expanded: 'solik@otherhost.test.ex'
+expanded: 'solik@otherhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: solik@otherhost.test.ex
 extract item: solik@otherhost.test.ex
@@ -81,7 +81,7 @@ checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 processing address_data
 calling r3 router
 rda_interpret (string): '$local_part@$original_domain.sub.test.ex'
-expanded: 'solik@otherhost.sub.test.ex'
+expanded: 'solik@otherhost.sub.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: solik@otherhost.sub.test.ex
 extract item: solik@otherhost.sub.test.ex
@@ -110,7 +110,7 @@ local_part=solik domain=otherhost.sub.test.ex
 checking domains
 calling r4 router
 rda_interpret (string): ':fail:Can't route to $domain'
-expanded: ':fail:Can't route to otherhost.sub.test.ex'
+expanded: ':fail:Can't route to otherhost.sub.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: :fail:Can't route to otherhost.sub.test.ex
 extract item: :fail:Can't route to otherhost.sub.test.ex
@@ -123,7 +123,7 @@ checking domains
 processing address_data
 calling r1 router
 rda_interpret (string): '$local_part@$domain.test.ex'
-expanded: 'xxx@ten-1.test.ex'
+expanded: 'xxx@ten-1.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: xxx@ten-1.test.ex
 extract item: xxx@ten-1.test.ex
@@ -158,7 +158,7 @@ checking domains
 processing address_data
 calling r1 router
 rda_interpret (string): '$local_part@$domain.test.ex'
-expanded: 'xxx@testsub.test.ex'
+expanded: 'xxx@testsub.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: xxx@testsub.test.ex
 extract item: xxx@testsub.test.ex
@@ -184,7 +184,7 @@ checking "condition" "${if eq{$address_data}{}{no}{yes}}"...
 processing address_data
 calling r3 router
 rda_interpret (string): '$local_part@$original_domain.sub.test.ex'
-expanded: 'xxx@testsub.sub.test.ex'
+expanded: 'xxx@testsub.sub.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: xxx@testsub.sub.test.ex
 extract item: xxx@testsub.sub.test.ex

diff --git a/test/stderr/0377 b/test/stderr/0377
index 98f92e0a360f884b5ea76ac67647c75fdd98185e..f395ee37a6742c79813fcf41d21111b510761a9b 100644 (file)
--- a/test/stderr/0377
+++ b/test/stderr/0377
@@ -55,7 +55,7 @@ local_part=cccc domain=myhost.test.ex
 checking local_parts
 calling cccc_redirect router
 rda_interpret (string): 'cccc@$domain, defer_cccc@$domain'
-expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex'
+expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: cccc@myhost.test.ex, defer_cccc@myhost.test.ex
 extract item: cccc@myhost.test.ex
@@ -89,7 +89,7 @@ checking local_parts
 checking "condition" "${if first_delivery{yes}{no}}"...
 calling bbbb router
 rda_interpret (string): 'bbbb@$domain, defer_bbbb@$domain'
-expanded: 'bbbb@myhost.test.ex, defer_bbbb@myhost.test.ex'
+expanded: 'bbbb@myhost.test.ex, defer_bbbb@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: bbbb@myhost.test.ex, defer_bbbb@myhost.test.ex
 extract item: bbbb@myhost.test.ex
@@ -115,7 +115,7 @@ checking local_parts
 checking "condition" "${if first_delivery{yes}{no}}"...
 calling unseen_aaaa router
 rda_interpret (string): 'defer_aaaa@$domain'
-expanded: 'defer_aaaa@myhost.test.ex'
+expanded: 'defer_aaaa@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: defer_aaaa@myhost.test.ex
 extract item: defer_aaaa@myhost.test.ex
@@ -357,7 +357,7 @@ checking local_parts
 checking "condition" "${if first_delivery{no}{yes}}"...
 calling cccc_2nd_time router
 rda_interpret (string): '$local_part@$domain'
-expanded: 'cccc@myhost.test.ex'
+expanded: 'cccc@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: cccc@myhost.test.ex
 extract item: cccc@myhost.test.ex
@@ -459,7 +459,7 @@ local_part=cccc domain=myhost.test.ex
 checking local_parts
 calling cccc_redirect router
 rda_interpret (string): 'cccc@$domain, defer_cccc@$domain'
-expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex'
+expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: cccc@myhost.test.ex, defer_cccc@myhost.test.ex
 extract item: cccc@myhost.test.ex
@@ -601,7 +601,7 @@ checking local_parts
 checking "condition" "${if first_delivery{no}{yes}}"...
 calling cccc_2nd_time router
 rda_interpret (string): '$local_part@$domain'
-expanded: 'cccc@myhost.test.ex'
+expanded: 'cccc@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: cccc@myhost.test.ex
 extract item: cccc@myhost.test.ex
@@ -703,7 +703,7 @@ local_part=cccc domain=myhost.test.ex
 checking local_parts
 calling cccc_redirect router
 rda_interpret (string): 'cccc@$domain, defer_cccc@$domain'
-expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex'
+expanded: 'cccc@myhost.test.ex, defer_cccc@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: cccc@myhost.test.ex, defer_cccc@myhost.test.ex
 extract item: cccc@myhost.test.ex

diff --git a/test/stderr/0378 b/test/stderr/0378
index e48fb7e76d8f2e214398ebd757640aab39865e6f..dec0651311143a649fd976096c9d220d39f328d9 100644 (file)
--- a/test/stderr/0378
+++ b/test/stderr/0378
@@ -40,7 +40,7 @@ deliver defer_aaaa@myhost.test.ex
 save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
-text "This is an autoreply"'
+text "This is an autoreply"' (tainted)
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing
@@ -193,7 +193,7 @@ checking local_parts
 checking "condition" "${if first_delivery{no}{yes}}"...
 calling aaaa_2nd_time router
 rda_interpret (string): 'aaaa@$domain'
-expanded: 'aaaa@myhost.test.ex'
+expanded: 'aaaa@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: aaaa@myhost.test.ex
 extract item: aaaa@myhost.test.ex
@@ -230,7 +230,7 @@ deliver defer_aaaa@myhost.test.ex
 save TESTSUITE/test-mail/file
 pipe "/bin/sh -c exit"
 mail subject autoreply
-text "This is an autoreply"'
+text "This is an autoreply"' (tainted)
 data is an Exim filter program
 Filter: start of processing
 Filter: end of processing

diff --git a/test/stderr/0379 b/test/stderr/0379
index 26a225fe2d27dbec6196585bfa9d698c8224fd85..7c0f0b9e0084729e3de433a5e68d195dd260e24b 100644 (file)
--- a/test/stderr/0379
+++ b/test/stderr/0379
@@ -30,7 +30,7 @@ local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling aaaa_redirect router
 rda_interpret (string): 'bbbb@$domain, cccc@$domain'
-expanded: 'bbbb@myhost.test.ex, cccc@myhost.test.ex'
+expanded: 'bbbb@myhost.test.ex, cccc@myhost.test.ex' (tainted)
 file is not a filter file
 parse_forward_list: bbbb@myhost.test.ex, cccc@myhost.test.ex
 extract item: bbbb@myhost.test.ex

diff --git a/test/stderr/0380 b/test/stderr/0380
index c653fc309344736e4cf70a72bf1d4dd0afdfbd17..b163d3f99b2434f2e83ca2b46bcea80dbfb87fc7 100644 (file)
--- a/test/stderr/0380
+++ b/test/stderr/0380
@@ -33,7 +33,7 @@ r1 router skipped: local_parts mismatch
 local_part=bbbb domain=myhost.test.ex
 checking local_parts
 calling r2 router
-rda_interpret (file): 'TESTSUITE/non-exist/$local_part'
+rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}'
 expanded: 'TESTSUITE/non-exist/bbbb'
 TESTSUITE/non-exist/bbbb does not exist
 ignore_enotdir set => skip checking parent directory
@@ -61,7 +61,7 @@ forced failure in expansion of "${if eq {a}{b}{x}fail}" (address_data): decline
 local_part=aaaa domain=myhost.test.ex
 checking local_parts
 calling r1 router
-rda_interpret (file): 'TESTSUITE/non-exist/$local_part'
+rda_interpret (file): 'TESTSUITE/non-exist/${bless:$local_part}'
 expanded: 'TESTSUITE/non-exist/aaaa'
 TESTSUITE/non-exist/aaaa does not exist
 checking parent directory

diff --git a/test/stderr/0464 b/test/stderr/0464
index 512ed1b5843f5c4f59d5a047cb3a782353c99395..86e8fe38d0e4010370bc26cf413d597c041f436e 100644 (file)
--- a/test/stderr/0464
+++ b/test/stderr/0464
@@ -50,7 +50,7 @@ cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
-expanded: 'abc@xxx.domain1'
+expanded: 'abc@xxx.domain1' (tainted)
 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1
@@ -117,7 +117,7 @@ cached lookup data = data for domain1
 domain1 in "+special_domains"? yes (matched "+special_domains" - cached)
 calling r1 router
 rda_interpret (string): '$local_part@xxx.$domain'
-expanded: 'abc@xxx.domain1'
+expanded: 'abc@xxx.domain1' (tainted)
 file is not a filter file
 parse_forward_list: abc@xxx.domain1
 extract item: abc@xxx.domain1

diff --git a/test/stderr/0584 b/test/stderr/0584
new file mode 100644 (file)
index 0000000..af4f471
--- /dev/null
+++ b/test/stderr/0584
@@ -0,0 +1 @@
+1999-03-02 09:44:33 10HmaX-0005vi-00 == CALLER@the.local.host.name R=localuser T=local_delivery defer (-1): Tainted 'TESTSUITE/test-mail/CALLER' (file or directory name for local_delivery transport) not permitted

diff --git a/test/stdout/0584 b/test/stdout/0584
new file mode 100644 (file)
index 0000000..4e4673d
--- /dev/null
+++ b/test/stdout/0584
@@ -0,0 +1,6 @@
+220 the.local.host.name ESMTP Exim x.yz Tue, 2 Mar 1999 09:44:33 +0000\r
+250 OK\r
+250 Accepted\r
+354 Enter message, ending with "." on a line by itself\r
+250 OK id=10HmaX-0005vi-00\r
+221 the.local.host.name closing connection\r