DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0307

diff --git a/test/confs/0307 b/test/confs/0307
index 81857eca489f83ecb4d3ccd7d8f3be8eeef91b0d..e07ef794f2668df0a63522adf282a8df61914e24 100644 (file)
--- 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
   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
   forbid_pipe
   forbid_file
   one_time


@@ -54,7 +52,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: