Taint: fix dsearch result to be untainted

[exim.git] / test / confs / 0153

diff --git a/test/confs/0153 b/test/confs/0153
index c16f88fe95a98f0f58b7f4896350ed4b74c6bc9d..24f499b41f1603723632326dd22d23ebfa2c9d3b 100644 (file)
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -13,17 +13,16 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
-  address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{$1}}
-  data = ${if exists{DIR/aux-fixed/TESTNUM.alias.$address_data} \
-           {${lookup{$local_part}lsearch{DIR/aux-fixed/TESTNUM.alias.$address_data}}} \
-          fail}
+  address_data = ${lookup {TESTNUM.alias.${extract {1}{.}{$domain}}} \
+                       dsearch{DIR/aux-fixed} {$value}fail}
+  data = ${lookup{$local_part}lsearch{DIR/aux-fixed/$address_data}}
   no_more
 
 list:
   driver = redirect
   domains = list.test.ex
-  file = ${if exists{DIR/aux-fixed/TESTNUM.list.$local_part} \
-            {DIR/aux-fixed/TESTNUM.list.$local_part}fail}
+  file = ${if exists{DIR/aux-fixed/TESTNUM.list.${bless:$local_part}} \
+            {DIR/aux-fixed/TESTNUM.list.${bless:$local_part}}fail}
   no_more
 
 real: