DKIM: tighten up parsing for DKIM DNS and header records. Bug 3056

[exim.git] / test / confs / 0153

diff --git a/test/confs/0153 b/test/confs/0153
index 69e02ebcf657fc13d41579aee9701969967c7d87..60a9cb9a5d71ac99950ad7b25e46e127e85b5c3f 100644 (file)
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -13,17 +13,14 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
 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}
+  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
   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.$local_part}fail}
+  file = ${lookup {TESTNUM.list.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}

   no_more
 
 real:
   no_more
 
 real: