LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0266

diff --git a/test/confs/0266 b/test/confs/0266
index 534abaea8aad5f56bb9869408393aa3ce1ce35da..9ebbeb47502ce660bf75e5f524770415a247c77b 100644 (file)
--- a/test/confs/0266
+++ b/test/confs/0266
@@ -1,13 +1,8 @@
 # Exim test configuration 0266
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----
 
@@ -21,6 +16,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
   envelope_to_add
   return_path_add
@@ -34,28 +30,16 @@ r1:
   skip_syntax_errors
   local_parts = ^list
   syntax_errors_to = postmaster@test.ex
-  file = DIR/aux-fixed/TESTNUM.$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.$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.$local_part
-  allow_filter
-  router_home_directory = DIR
-  user = CALLER
-
 r3:
   driver = accept
   transport = t1