Cutthrough: handle request when a callout-hold is active. Bug 2604

[exim.git] / test / confs / 0153

diff --git a/test/confs/0153 b/test/confs/0153
index 7b5f023b4c97548fa17ace0d3c15358749829787..35a004a455a859f1443874ed74d80af95df9fd2e 100644 (file)
--- a/test/confs/0153
+++ b/test/confs/0153
@@ -13,22 +13,17 @@ begin routers
 virtual:
   driver = redirect
   domains = *.virt.test.ex
-#  address_data = ${if match{$domain}{^(.*)\\.virt\\.test\\.ex\$}{${bless:$1}}}
-  address_data = $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 {TESTNUM.alias.$address_data} dsearch,ret=full {DIR/aux-fixed} \
-           {${lookup{$local_part}lsearch{$value}}} \
-          fail}
+  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}
   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}
+  file = ${if exists{DIR/aux-fixed/TESTNUM.list.${bless:$local_part}} \
+            {DIR/aux-fixed/TESTNUM.list.${bless:$local_part}}fail}
   no_more
 
 real: