X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/ba74fb8d95d2e9af2122e0a95c4d5334b4f0466c..6fcb3173d64ef8a9d70f8adf19f134a0cd9cf6e8:/test/confs/0307?ds=sidebyside diff --git a/test/confs/0307 b/test/confs/0307 index 81857eca4..e07ef794f 100644 --- 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 - 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 @@ -54,7 +52,8 @@ begin transports t1: driver = appendfile - file = DIR/test-mail/${bless:$local_part} + file = DIR/test-mail/$local_part + create_file = DIR/test-mail user = CALLER t2: