DMARC: expand main-config options. Bug 3102

[exim.git] / test / confs / 0270

diff --git a/test/confs/0270 b/test/confs/0270
index e09ff0e761ae0a190b2acb2d48f85dab72432df1..e267df056b2855b6fc9e45c78d6d03a1f4113104 100644 (file)
--- a/test/confs/0270
+++ b/test/confs/0270
@@ -15,7 +15,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
   envelope_to_add
   return_path_add
@@ -29,28 +30,16 @@ r1:
   skip_syntax_errors
   local_parts = ^list
   syntax_errors_to = postmaster@test.ex
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
 
 r1a:
   driver = redirect
   skip_syntax_errors
   local_parts = ^nmlist
   syntax_errors_to = postmaster@test.ex
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
+  file = ${lookup {TESTNUM.$local_part} dsearch,ret=full {DIR/aux-fixed} {$value}fail}
   no_more
 
-r2:
-  driver = redirect
-  skip_syntax_errors
-  local_parts = ^filter
-  syntax_errors_to = postmaster@test.ex
-  syntax_errors_text = "There's an error in your filter file.\n\
-                        The file has been ignored."
-  file = DIR/aux-fixed/TESTNUM.${bless:$local_part}
-  allow_filter
-  router_home_directory = DIR/
-  user = CALLER
-
 r3:
   driver = accept
   transport = t1