DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0306

diff --git a/test/confs/0306 b/test/confs/0306
index c8bd1f362f5bf2696a5e5d159ccda8e012bc6a98..ec18055ad5395161c3dbce00726bb940c7d9e3af 100644 (file)
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -27,14 +27,15 @@ r1:
   driver = redirect
   domains = lists.test.ex
   local_part_suffix = -request
   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
 
 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/${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
   forbid_pipe
   forbid_file
   one_time


@@ -64,7 +65,8 @@ begin transports
 
 t1:
   driver = appendfile
 
 t1:
   driver = appendfile

-  file = DIR/test-mail/${bless:$local_part}
+  file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail

   user = CALLER
 
 t2:
   user = CALLER
 
 t2: