LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0306

diff --git a/test/confs/0306 b/test/confs/0306
index 2526d9df180a90c76503f710a7c5780fadf4d707..ec18055ad5395161c3dbce00726bb940c7d9e3af 100644 (file)
--- a/test/confs/0306
+++ b/test/confs/0306
@@ -1,13 +1,8 @@
 # Exim test configuration 0306
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -32,14 +27,15 @@ r1:
   driver = redirect
   domains = lists.test.ex
   local_part_suffix = -request
-  file = DIR/aux-fixed/TESTNUM/$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
-  senders = ${if exists {DIR/aux-fixed/TESTNUM/$local_part}\
-             {lsearch;DIR/aux-fixed/TESTNUM/$local_part}{*}}
-  file = DIR/aux-fixed/TESTNUM/$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
@@ -70,6 +66,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part
+  create_file = DIR/test-mail
   user = CALLER
 
 t2: