LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0380

diff --git a/test/confs/0380 b/test/confs/0380
index 5264a7d83906dde4446fae7666c8c06681c9a08d..0b7b1874a2ff1fe312e9fddb3047d68479e71524 100644 (file)
--- a/test/confs/0380
+++ b/test/confs/0380
@@ -1,14 +1,8 @@
 # Exim test configuration 0380
 
 # Exim test configuration 0380
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 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 -----
 
 
 # ----- Main settings -----
 


@@ -31,13 +25,13 @@ r0:
 r1:
   driver = redirect
   local_parts = aaaa
 r1:
   driver = redirect
   local_parts = aaaa

-  file = DIR/non-exist/$local_part
+  file = DIR/non-exist/aaaa

 
 r2:
   driver = redirect
   local_parts = bbbb
   ignore_enotdir
 
 r2:
   driver = redirect
   local_parts = bbbb
   ignore_enotdir

-  file = DIR/non-exist/$local_part
+  file = DIR/non-exist/bbbb

 
 r3:
   driver = accept
 
 r3:
   driver = accept


@@ -50,6 +44,7 @@ begin transports
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part
 t1:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 
   user = CALLER