LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0095

diff --git a/test/confs/0095 b/test/confs/0095
index f19bec7c17f1505bcb72bbd01a25bbc60808c6e1..4b18a494fe287372d00332becc2a56c151d2db6c 100644 (file)
--- a/test/confs/0095
+++ b/test/confs/0095
@@ -3,13 +3,9 @@
 ERT=
 QWM=
 
 ERT=
 QWM=
 

-exim_path = EXIM_PATH
-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

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


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

+  create_file = DIR/test-mail

   quota = $h_quota
   quota_warn_threshold = $h_threshold
   QWM
   quota = $h_quota
   quota_warn_threshold = $h_threshold
   QWM


@@ -52,13 +49,15 @@ appendfile:
 appendfile2:
   driver = appendfile
   file = DIR/test-mail/$local_part
 appendfile2:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   quota = $h_quota
   quota_warn_threshold = $h_threshold
   user = CALLER
 
 appendfile3:
   driver = appendfile
   quota = $h_quota
   quota_warn_threshold = $h_threshold
   user = CALLER
 
 appendfile3:
   driver = appendfile

-  file = DIR/test-mail/$local_part${if eq{$sender_address}{}{.bounce}}
+  file = DIR/test-mail/${local_part}${if eq{$sender_address}{}{.bounce}}
+  create_file = DIR/test-mail

   quota_warn_threshold = $h_threshold
   user = CALLER
   headers_add = X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
   quota_warn_threshold = $h_threshold
   user = CALLER
   headers_add = X:aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa