LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0194

diff --git a/test/confs/0194 b/test/confs/0194
index 548a9154532d7e39947bdc771521cd7cc5e5d1fc..15906b996b0dea50b0b8df7bab373e6f88c20452 100644 (file)
--- a/test/confs/0194
+++ b/test/confs/0194
@@ -1,14 +1,8 @@
 # Exim test configuration 0194
 
 # Exim test configuration 0194
 

-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 -----
 


@@ -38,6 +32,7 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 pipe:
   user = CALLER
 
 pipe:


@@ -50,7 +45,7 @@ pipe:
 piperet:
   driver = pipe
   batch_max = 100
 piperet:
   driver = pipe
   batch_max = 100

-  command = DIR/aux-fixed/TESTNUM.ret $h_ret:
+  command = DIR/aux-fixed/TESTNUM.ret "${if inlist {$h_ret:} {75:99} {$value}}"

   return_fail_output
   user = CALLER
 
   return_fail_output
   user = CALLER