Testsuite: tidying

34 files changed, 108 insertions, 113 deletions

diff --git a/src/src/acl.c b/src/src/acl.c
index ce8d2189f..a6c3d4cbe 100644
--- a/src/src/acl.c
+++ b/src/src/acl.c
@@ -4106,7 +4106,7 @@ if (is_tainted(acl_text) && !f.running_in_test_harness)
   *log_msgptr = US"internal configuration error";
   return ERROR;
   }
-#endi
+#endif
 
 /* Handle the case of a string that does not contain any spaces. Look for a
 named ACL among those read from the configuration, or a previously read file.
diff --git a/src/src/expand.c b/src/src/expand.c
index 8a571b2d9..bce335629 100644
--- a/src/src/expand.c
+++ b/src/src/expand.c
@@ -216,7 +216,6 @@ static uschar *op_table_main[] = {
   US"base62d",
   US"base64",
   US"base64d",
-  US"bless",
   US"domain",
   US"escape",
   US"escape8bit",
@@ -264,7 +263,6 @@ enum {
   EOP_BASE62D,
   EOP_BASE64,
   EOP_BASE64D,
-  EOP_BLESS,
   EOP_DOMAIN,
   EOP_ESCAPE,
   EOP_ESCAPE8BIT,
@@ -7112,20 +7110,6 @@ while (*s)
         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/test/aux-fixed/0297.Filter b/test/aux-fixed/0297.Filter
index 28f090ead..e911ce75c 100644
--- 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 ${bless:${local_part:$recipients}}
+save ${local_part:$recipients}
diff --git a/test/confs/0027 b/test/confs/0027
index 53e9357c0..6c5120d8e 100644
--- a/test/confs/0027
+++ b/test/confs/0027
@@ -39,7 +39,7 @@ data3:
 acl_rcpt:
   warn	 set acl_m_1 = ${acl {data}}
   accept endpass
-         acl = ${bless:${tr{$local_part}{:}{\n}}}
+         acl = ${tr{$local_part}{:}{\n}}
   deny   message = this message should not occur
 
 
diff --git a/test/confs/0084 b/test/confs/0084
index bbee05f04..88f43213c 100644
--- a/test/confs/0084
+++ b/test/confs/0084
@@ -20,7 +20,7 @@ smart:
 
 forward:
   driver = redirect
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed}}
   redirect_router = localuser
   require_files = DIR/aux-fixed/TESTNUM.$local_part
   retry_use_local_part
diff --git a/test/confs/0107 b/test/confs/0107
index f904150f1..190fa9776 100644
--- a/test/confs/0107
+++ b/test/confs/0107
@@ -26,9 +26,9 @@ begin transports
 appendfile:
   driver = appendfile
   create_file = belowhome
-  file = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.filelist}\
+  file = ${lookup {$local_part} lsearch {DIR/aux-fixed/TESTNUM.filelist}\
          	{${if match{$value}{^/}{}{DIR/}}$value}\
-         	{DIR/test-mail/${bless:$local_part}}}
+         	{DIR/test-mail/$local_part}}
   user = CALLER
 
 # ----- Retry -----
diff --git a/test/confs/0131 b/test/confs/0131
index 087bd5540..552060cde 100644
--- a/test/confs/0131
+++ b/test/confs/0131
@@ -25,7 +25,7 @@ forward:
   driver = redirect
   allow_filter
   no_check_local_user
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   retry_use_local_part
   user = CALLER
   address_data = $address_data-forward
diff --git a/test/confs/0153 b/test/confs/0153
index 35a004a45..60a9cb9a5 100644
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -13,17 +13,14 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
-  address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{${bless:$1}}}
-  data = ${if exists{DIR/aux-fixed/TESTNUM.alias.$address_data} \
-           {${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.alias.$address_data}}} \
-          fail}
+  data = ${lookup {$local_part} lsearch \
+		{${lookup {TESTNUM.alias.$1} dsearch,ret=full {DIR/aux-fixed} {$value}fail}}}
   no_more
 
 list:
   driver = redirect
   domains = list.test.ex
-  file = ${if exists{DIR/aux-fixed/TESTNUM.list.${bless:$local_part}} \
-            {DIR/aux-fixed/TESTNUM.list.${bless:$local_part}}fail}
+  file = ${lookup {TESTNUM.list.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   no_more
 
 real:
diff --git a/test/confs/0212 b/test/confs/0212
index 7cbc8c84a..223bd574f 100644
--- a/test/confs/0212
+++ b/test/confs/0212
@@ -58,7 +58,7 @@ alias:
 forward:
   driver = redirect
   no_check_local_user
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}.forward
+  file = ${lookup {TESTNUM.$local_part.forward} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   retry_use_local_part
 
 all:
diff --git a/test/confs/0226 b/test/confs/0226
index 379545bf8..e83120839 100644
--- a/test/confs/0226
+++ b/test/confs/0226
@@ -22,10 +22,14 @@ bounces:
 
 notallowed:
   driver = redirect
+  domains = no.test.ex
   allow_defer
   caseful_local_part
-  data = $local_part
-  domains = no.test.ex
+  data = ${extract {$local_part} \
+	  { file1=/a/b/c \
+	    pipe1=|/p/q/r \
+	    file2=DIR/test-mail/file \
+	    pipe2=|DIR/aux-fixed/showenv }}
   forbid_file
   forbid_pipe
   retry_use_local_part
@@ -34,7 +38,11 @@ allowed:
   driver = redirect
   allow_defer
   caseful_local_part
-  data = ${bless:$local_part}
+  data = ${extract {$local_part} \
+	  { file1=/a/b/c \
+	    pipe1=|/p/q/r \
+	    file2=DIR/test-mail/file \
+	    pipe2=|DIR/aux-fixed/showenv }}
   file_transport = address_file
   pipe_transport = address_pipe
   retry_use_local_part
diff --git a/test/confs/0237 b/test/confs/0237
index 0eb8f2603..31d6c4bcd 100644
--- a/test/confs/0237
+++ b/test/confs/0237
@@ -22,10 +22,14 @@ bounces:
 
 notallowed:
   driver = redirect
+  domains = no.test.ex
   allow_defer
   caseful_local_part
-  data = $local_part
-  domains = no.test.ex
+  data = ${extract {$local_part} \
+	  { file1=/a/b/c \
+	    pipe1=|/p/q/r \
+	    file2=DIR/test-mail/file \
+	    pipe2=|DIR/aux-fixed/showenv}}
   forbid_file
   forbid_pipe
   hide_child_in_errmsg
@@ -35,7 +39,11 @@ allowed:
   driver = redirect
   allow_defer
   caseful_local_part
-  data = ${bless:$local_part}
+  data = ${extract {$local_part} \
+	  { file1=/a/b/c \
+	    pipe1=|/p/q/r \
+	    file2=DIR/test-mail/file \
+	    pipe2=|DIR/aux-fixed/showenv}}
   file_transport = address_file
   hide_child_in_errmsg
   pipe_transport = address_pipe
diff --git a/test/confs/0243 b/test/confs/0243
index 438acc2fb..339312863 100644
--- a/test/confs/0243
+++ b/test/confs/0243
@@ -72,7 +72,7 @@ address_pipe:
 
 stuur_auto_antwoord:
   driver = autoreply
-  file = DIR/aux-fixed/TESTNUM.antwoord-${bless:$local_part}
+  file = ${lookup {TESTNUM.antwoord-$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   file_expand
   from = "${lookup{$local_part} lsearch \
            {DIR/aux-fixed/TESTNUM.beantwoorders} {$value}}"
diff --git a/test/confs/0251 b/test/confs/0251
index 9c951528c..ebad92684 100644
--- a/test/confs/0251
+++ b/test/confs/0251
@@ -32,14 +32,13 @@ exeter_listr:
   no_check_local_user
   domains = listr.test.ex
   errors_to = ${local_part}-request@test.ex
-  file = DIR/aux-fixed/TESTNUM.list.${bless:$local_part}
+  file = ${lookup {TESTNUM.list.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   forbid_file
   forbid_pipe
   one_time
   require_files = DIR/aux-fixed/TESTNUM.restrict.${local_part}
   retry_use_local_part
-  senders = ${if exists{DIR/aux-fixed/TESTNUM.restrict.${local_part}} \
-    {${bless:DIR/aux-fixed/TESTNUM.restrict.${local_part}}}{zzzz}}
+  senders = ${lookup {TESTNUM.restrict.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value} {zzzz}}
   syntax_errors_to = ${local_part}-request@test.ex
 
 exeter_listf:
diff --git a/test/confs/0266 b/test/confs/0266
index 6558a5ef2..2f6cece91 100644
--- a/test/confs/0266
+++ b/test/confs/0266
@@ -30,14 +30,14 @@ r1:
   skip_syntax_errors
   local_parts = ^list
   syntax_errors_to = postmaster@test.ex
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
 
 r1a:
   driver = redirect
   skip_syntax_errors
   local_parts = ^nmlist
   syntax_errors_to = postmaster@test.ex
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   no_more
 
 r2:
@@ -47,7 +47,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.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   allow_filter
   router_home_directory = DIR
   user = CALLER
diff --git a/test/confs/0270 b/test/confs/0270
index 8b3441cd0..7dae6d523 100644
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -30,14 +30,14 @@ r1:
   skip_syntax_errors
   local_parts = ^list
   syntax_errors_to = postmaster@test.ex
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
 
 r1a:
   driver = redirect
   skip_syntax_errors
   local_parts = ^nmlist
   syntax_errors_to = postmaster@test.ex
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   no_more
 
 r2:
@@ -47,7 +47,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.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   allow_filter
   router_home_directory = DIR/
   user = CALLER
diff --git a/test/confs/0297 b/test/confs/0297
index 2c98b99c5..b07fc54cb 100644
--- a/test/confs/0297
+++ b/test/confs/0297
@@ -17,7 +17,7 @@ begin routers
 
 r1:
   driver = redirect
-  data = ${bless:$local_part}
+  data = $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/0306 b/test/confs/0306
index c346012df..ec18055ad 100644
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -27,14 +27,15 @@ r1:
   driver = redirect
   domains = lists.test.ex
   local_part_suffix = -request
-  file = DIR/aux-fixed/TESTNUM/${bless:$local_part$local_part_suffix}
+  file = ${lookup {$local_part$local_part_suffix} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}fail}
 
 r2:
   driver = redirect
   domains = lists.test.ex
-  senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
-             {lsearch;${bless:DIR/aux-fixed/TESTNUM/$local_part}}{*}}
-  file = DIR/aux-fixed/TESTNUM/${bless:$local_part}
+  senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part} \
+             {lsearch;${lookup {$local_part} dsearch,ret=full {DIR/aux-fixed/TESTNUM}}} \
+	     {*}}
+  file = ${lookup {$local_part} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}fail}
   forbid_pipe
   forbid_file
   one_time
diff --git a/test/confs/0307 b/test/confs/0307
index 9e78a0c15..e07ef794f 100644
--- a/test/confs/0307
+++ b/test/confs/0307
@@ -19,12 +19,10 @@ r1:
   domains = lists.test.ex
   local_part_suffix = -request
   local_part_suffix_optional
-  senders = ${if eq {$local_part_suffix}{-request}{*}\
-            {\
-            ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
-             {lsearch;${bless:DIR/aux-fixed/TESTNUM/$local_part}}{*}}\
-            }}
-  file = DIR/aux-fixed/TESTNUM/${bless:$local_part$local_part_suffix}
+  senders = ${if eq {$local_part_suffix}{-request} \
+	      {*} \
+	      {${lookup {$local_part} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}{*}}} }
+  file = ${lookup {$local_part$local_part_suffix} dsearch,ret=full {DIR/aux-fixed/TESTNUM} {$value}fail}
   forbid_pipe
   forbid_file
   one_time
diff --git a/test/confs/0380 b/test/confs/0380
index 42eb64ed3..0b7b1874a 100644
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -25,13 +25,13 @@ r0:
 r1:
   driver = redirect
   local_parts = aaaa
-  file = DIR/non-exist/${bless:$local_part}
+  file = DIR/non-exist/aaaa
 
 r2:
   driver = redirect
   local_parts = bbbb
   ignore_enotdir
-  file = DIR/non-exist/${bless:$local_part}
+  file = DIR/non-exist/bbbb
 
 r3:
   driver = accept
diff --git a/test/confs/0452 b/test/confs/0452
index 8d04b4242..8ac3b923f 100644
--- a/test/confs/0452
+++ b/test/confs/0452
@@ -17,7 +17,7 @@ begin routers
 r1:
   driver = redirect
   allow_filter
-  file = DIR/aux-fixed/TESTNUM.${bless:filter-$h_fno:}
+  file = DIR/aux-fixed/TESTNUM.filter-FILTER
   reply_transport = t2
   user = CALLER
 
diff --git a/test/confs/0506 b/test/confs/0506
index 35cdef19a..29c6a17d1 100644
--- a/test/confs/0506
+++ b/test/confs/0506
@@ -20,7 +20,7 @@ r1:
   user = EXIMUSER
   ALLOW
   FORBID
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
 
 
 # ----- Retry -----
diff --git a/test/confs/0533 b/test/confs/0533
index 82699fe05..36e547ad6 100644
--- a/test/confs/0533
+++ b/test/confs/0533
@@ -16,7 +16,7 @@ r1:
   driver = redirect
   local_part_prefix = file-
   local_part_suffix = =*
-  data = DIR/test-mail/${substr_1:$local_part_suffix}
+  data = DIR/test-mail/${extract {${substr_1:$local_part_suffix}} {mbox=mbox mbox2=mbox2}}
   file_transport = t1
 
 r2:
@@ -24,7 +24,7 @@ r2:
   local_part_prefix = pipe-
   local_part_suffix = =*
   caseful_local_part = true
-  data = |${bless:${substr_1:$local_part_suffix}}
+  data = |DIR/bin/${extract {$local_part} {userx=iefbr14 usery=iefbr14 userz=../bin/iefbr14}}
   pipe_transport = t2
 
 
diff --git a/test/confs/0576 b/test/confs/0576
index 5b023d280..d6c0a1dc5 100644
--- a/test/confs/0576
+++ b/test/confs/0576
@@ -16,7 +16,7 @@ begin acl
 
 rcpt:
   accept
-    queue = ${if eq {normal}{$local_part} {} {${bless:$local_part}}}
+    queue = ${extract {$local_part} {normal="" alternate=alternate lowpri=lowpri}}
     logwrite = using queue '$queue_name'
 
 #---------------
diff --git a/test/confs/5001 b/test/confs/5001
index 7bf79ae38..68b9d12c7 100644
--- a/test/confs/5001
+++ b/test/confs/5001
@@ -27,9 +27,9 @@ maildir:
   driver = appendfile
   maildir_format
   create_file = belowhome
-  directory = ${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.filelist}\
-              {${if match{$value}{^/}{}{DIR/}}$value}\
-              {DIR/test-mail/${bless:$local_part}}}
+  directory = ${lookup {$local_part} lsearch {DIR/aux-fixed/TESTNUM.filelist}\
+		{${if match{$value}{^/}{}{DIR/}}$value}\
+		{DIR/test-mail/$local_part}}
   user = CALLER
 
 
diff --git a/test/log/0226 b/test/log/0226
index c1ef25c97..408e4fe0d 100644
--- a/test/log/0226
+++ b/test/log/0226
@@ -1,13 +1,13 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** /a/b/c </a/b/c@no.test.ex> R=notallowed: delivery to file forbidden
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/p/q/r <|/p/q/r@no.test.ex> R=notallowed: delivery to pipe forbidden
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** /a/b/c <file1@no.test.ex> R=notallowed: delivery to file forbidden
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/p/q/r <pipe1@no.test.ex> R=notallowed: delivery to pipe forbidden
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=bounces T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |TESTSUITE/aux-fixed/showenv <|TESTSUITE/aux-fixed/showenv@yes.test.ex> R=allowed T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => TESTSUITE/test-mail/file <TESTSUITE/test-mail/file@yes.test.ex> R=allowed T=address_file
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |TESTSUITE/aux-fixed/showenv <pipe2@yes.test.ex> R=allowed T=address_pipe: return message generated
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => TESTSUITE/test-mail/file <file2@yes.test.ex> R=allowed T=address_file
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=bounces T=local_delivery
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/log/0237 b/test/log/0237
index c1ef25c97..408e4fe0d 100644
--- a/test/log/0237
+++ b/test/log/0237
@@ -1,13 +1,13 @@
 1999-03-02 09:44:33 10HmaX-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** /a/b/c </a/b/c@no.test.ex> R=notallowed: delivery to file forbidden
-1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/p/q/r <|/p/q/r@no.test.ex> R=notallowed: delivery to pipe forbidden
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** /a/b/c <file1@no.test.ex> R=notallowed: delivery to file forbidden
+1999-03-02 09:44:33 10HmaX-0005vi-00 ** |/p/q/r <pipe1@no.test.ex> R=notallowed: delivery to pipe forbidden
 1999-03-02 09:44:33 10HmaY-0005vi-00 <= <> R=10HmaX-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmaY-0005vi-00 => CALLER <CALLER@test.ex> R=bounces T=local_delivery
 1999-03-02 09:44:33 10HmaY-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaX-0005vi-00 Completed
 1999-03-02 09:44:33 10HmaZ-0005vi-00 <= CALLER@test.ex U=CALLER P=local S=sss
-1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |TESTSUITE/aux-fixed/showenv <|TESTSUITE/aux-fixed/showenv@yes.test.ex> R=allowed T=address_pipe: return message generated
-1999-03-02 09:44:33 10HmaZ-0005vi-00 => TESTSUITE/test-mail/file <TESTSUITE/test-mail/file@yes.test.ex> R=allowed T=address_file
+1999-03-02 09:44:33 10HmaZ-0005vi-00 ** |TESTSUITE/aux-fixed/showenv <pipe2@yes.test.ex> R=allowed T=address_pipe: return message generated
+1999-03-02 09:44:33 10HmaZ-0005vi-00 => TESTSUITE/test-mail/file <file2@yes.test.ex> R=allowed T=address_file
 1999-03-02 09:44:33 10HmbA-0005vi-00 <= <> R=10HmaZ-0005vi-00 U=EXIMUSER P=local S=sss
 1999-03-02 09:44:33 10HmbA-0005vi-00 => CALLER <CALLER@test.ex> R=bounces T=local_delivery
 1999-03-02 09:44:33 10HmbA-0005vi-00 Completed
diff --git a/test/mail/0226.CALLER b/test/mail/0226.CALLER
index 900785bee..e8425b6de 100644
--- a/test/mail/0226.CALLER
+++ b/test/mail/0226.CALLER
@@ -2,8 +2,8 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmaY-0005vi-00
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-X-Failed-Recipients: |/p/q/r@no.test.ex,
-  /a/b/c@no.test.ex
+X-Failed-Recipients: pipe1@no.test.ex,
+  file1@no.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -23,9 +23,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   pipe to |/p/q/r
-    generated by |/p/q/r@no.test.ex
+    generated by pipe1@no.test.ex
   save to /a/b/c
-    generated by /a/b/c@no.test.ex
+    generated by file1@no.test.ex
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
@@ -33,11 +33,11 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;/a/b/c@no.test.ex
+Final-Recipient: rfc822;file1@no.test.ex
 Status: 5.0.0
 
 Action: failed
-Final-Recipient: rfc822;|/p/q/r@no.test.ex
+Final-Recipient: rfc822;pipe1@no.test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -59,7 +59,7 @@ From MAILER-DAEMON Tue Mar 02 09:44:33 1999
 Received: from EXIMUSER by the.local.host.name with local (Exim x.yz)
 	id 10HmbA-0005vi-00
 	for CALLER@test.ex; Tue, 2 Mar 1999 09:44:33 +0000
-X-Failed-Recipients: |TESTSUITE/aux-fixed/showenv@yes.test.ex
+X-Failed-Recipients: pipe2@yes.test.ex
 Auto-Submitted: auto-replied
 From: Mail Delivery System <Mailer-Daemon@test.ex>
 To: CALLER@test.ex
@@ -79,12 +79,12 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   pipe to |TESTSUITE/aux-fixed/showenv
-    generated by |TESTSUITE/aux-fixed/showenv@yes.test.ex
+    generated by pipe2@yes.test.ex
 
 The following text was generated during the delivery attempt:
 
 ------ pipe to |TESTSUITE/aux-fixed/showenv
-       generated by |TESTSUITE/aux-fixed/showenv@yes.test.ex ------
+       generated by pipe2@yes.test.ex ------
 
 Test pipe script
 Running as: CALLER
@@ -99,18 +99,18 @@ C=
 COLON=
 DOMAIN=yes.test.ex
 HOME=
-LOCAL_PART=|TESTSUITE/aux-fixed/showenv
+LOCAL_PART=pipe2
 LOCAL_PART_PREFIX=
 LOCAL_PART_SUFFIX=
-LOGNAME=|TESTSUITE/aux-fixed/showenv
+LOGNAME=pipe2
 ME=
 MESSAGE_ID=10HmaZ-0005vi-00
 PATH=/bin:/usr/bin
 QUALIFY_DOMAIN=test.ex
-RECIPIENT=|TESTSUITE/aux-fixed/showenv@yes.test.ex
+RECIPIENT=pipe2@yes.test.ex
 SENDER=CALLER@test.ex
 SHELL=/bin/sh
-USER=|TESTSUITE/aux-fixed/showenv
+USER=pipe2
 ----------cat-----------
 >From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -130,7 +130,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv@yes.test.ex
+Final-Recipient: rfc822;pipe2@yes.test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/mail/0237.CALLER b/test/mail/0237.CALLER
index 4a1412c36..6b607c26b 100644
--- a/test/mail/0237.CALLER
+++ b/test/mail/0237.CALLER
@@ -21,9 +21,9 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   an undisclosed address
-    (generated from |/p/q/r@no.test.ex)
+    (generated from pipe1@no.test.ex)
   an undisclosed address
-    (generated from /a/b/c@no.test.ex)
+    (generated from file1@no.test.ex)
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
 Content-type: message/delivery-status
@@ -31,11 +31,11 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;/a/b/c@no.test.ex
+Final-Recipient: rfc822;file1@no.test.ex
 Status: 5.0.0
 
 Action: failed
-Final-Recipient: rfc822;|/p/q/r@no.test.ex
+Final-Recipient: rfc822;pipe1@no.test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
@@ -76,12 +76,12 @@ A message that you sent could not be delivered to one or more of its
 recipients. This is a permanent error. The following address(es) failed:
 
   an undisclosed address
-    (generated from |TESTSUITE/aux-fixed/showenv@yes.test.ex)
+    (generated from pipe2@yes.test.ex)
 
 The following text was generated during the delivery attempt:
 
 ------ an undisclosed address
-       (generated from |TESTSUITE/aux-fixed/showenv@yes.test.ex) ------
+       (generated from pipe2@yes.test.ex) ------
 
 Test pipe script
 Running as: CALLER
@@ -96,18 +96,18 @@ C=
 COLON=
 DOMAIN=yes.test.ex
 HOME=
-LOCAL_PART=|TESTSUITE/aux-fixed/showenv
+LOCAL_PART=pipe2
 LOCAL_PART_PREFIX=
 LOCAL_PART_SUFFIX=
-LOGNAME=|TESTSUITE/aux-fixed/showenv
+LOGNAME=pipe2
 ME=
 MESSAGE_ID=10HmaZ-0005vi-00
 PATH=/bin:/usr/bin
 QUALIFY_DOMAIN=test.ex
-RECIPIENT=|TESTSUITE/aux-fixed/showenv@yes.test.ex
+RECIPIENT=pipe2@yes.test.ex
 SENDER=CALLER@test.ex
 SHELL=/bin/sh
-USER=|TESTSUITE/aux-fixed/showenv
+USER=pipe2
 ----------cat-----------
 >From CALLER@test.ex Tue Mar 02 09:44:33 1999
 Received: from CALLER by the.local.host.name with local (Exim x.yz)
@@ -127,7 +127,7 @@ Content-type: message/delivery-status
 Reporting-MTA: dns; the.local.host.name
 
 Action: failed
-Final-Recipient: rfc822;|TESTSUITE/aux-fixed/showenv@yes.test.ex
+Final-Recipient: rfc822;pipe2@yes.test.ex
 Status: 5.0.0
 
 --NNNNNNNNNN-eximdsn-MMMMMMMMMM
diff --git a/test/scripts/0000-Basic/0226 b/test/scripts/0000-Basic/0226
index ce7e4701e..cfa140d7a 100644
--- a/test/scripts/0000-Basic/0226
+++ b/test/scripts/0000-Basic/0226
@@ -1,8 +1,8 @@
 # redirect: file and pipe addresses
-exim -odi /a/b/c@no.test.ex '|/p/q/r'@no.test.ex
+exim -odi file1@no.test.ex pipe1@no.test.ex
 Message 1
 ****
-exim -odi DIR/test-mail/file@yes.test.ex '|DIR/aux-fixed/showenv'@yes.test.ex
+exim -odi file2@yes.test.ex pipe2@yes.test.ex
 Message 2
 ****
 no_msglog_check
diff --git a/test/scripts/0000-Basic/0237 b/test/scripts/0000-Basic/0237
index 9cb2aa655..59ba4ca96 100644
--- a/test/scripts/0000-Basic/0237
+++ b/test/scripts/0000-Basic/0237
@@ -1,8 +1,8 @@
 # redirect: file and pipe addresses with hide_child_in_errmsg
-exim -odi /a/b/c@no.test.ex '|/p/q/r'@no.test.ex
+exim -odi file1@no.test.ex pipe1@no.test.ex
 Message 1
 ****
-exim -odi DIR/test-mail/file@yes.test.ex '|DIR/aux-fixed/showenv'@yes.test.ex
+exim -odi file2@yes.test.ex pipe2@yes.test.ex
 Message 2
 ****
 no_msglog_check
diff --git a/test/scripts/0000-Basic/0452 b/test/scripts/0000-Basic/0452
index 7f94509b9..add5d68d1 100644
--- a/test/scripts/0000-Basic/0452
+++ b/test/scripts/0000-Basic/0452
@@ -1,9 +1,9 @@
 # "extra_headers" argument in "mail" in user filter
-exim -odi userx
+exim -DFILTER=1 -odi userx
 fno: 1
 This is a message.
 ****
-exim -odi userx
+exim -DFILTER=2 -odi userx
 fno: 2
 Another message 
 ****
diff --git a/test/stderr/0084 b/test/stderr/0084
index 3f15cbc8f..7b93db7fb 100644
--- a/test/stderr/0084
+++ b/test/stderr/0084
@@ -17,7 +17,7 @@ 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.${bless:$local_part}'
+rda_interpret (file): '${lookup {0084.$local_part} dsearch,ret=full {TESTSUITE/aux-fixed}}'
 expanded: 'TESTSUITE/aux-fixed/0084.yes'
 ssss bytes read from TESTSUITE/aux-fixed/0084.yes
 file is not a filter file
diff --git a/test/stderr/0297 b/test/stderr/0297
index 42db67a73..200f76ab4 100644
--- a/test/stderr/0297
+++ b/test/stderr/0297
@@ -8,8 +8,8 @@ routing /a/b/c@myhost.test.ex
 --------> r1 router <--------
 local_part=/a/b/c domain=myhost.test.ex
 calling r1 router
-rda_interpret (string): '${bless:$local_part}'
-expanded: '/a/b/c'
+rda_interpret (string): '$local_part'
+expanded: '/a/b/c' (tainted)
 file is not a filter file
 parse_forward_list: /a/b/c
 extract item: /a/b/c
@@ -32,8 +32,8 @@ routing /x/y/z@myhost.test.ex
 --------> r1 router <--------
 local_part=/x/y/z domain=myhost.test.ex
 calling r1 router
-rda_interpret (string): '${bless:$local_part}'
-expanded: '/x/y/z'
+rda_interpret (string): '$local_part'
+expanded: '/x/y/z' (tainted)
 file is not a filter file
 parse_forward_list: /x/y/z
 extract item: /x/y/z
diff --git a/test/stderr/0380 b/test/stderr/0380
index 4041acc95..b4a0af0ca 100644
--- 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/${bless:$local_part}'
+rda_interpret (file): 'TESTSUITE/non-exist/bbbb'
 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/${bless:$local_part}'
+rda_interpret (file): 'TESTSUITE/non-exist/aaaa'
 expanded: 'TESTSUITE/non-exist/aaaa'
 TESTSUITE/non-exist/aaaa does not exist
 checking parent directory