LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0046

diff --git a/test/confs/0046 b/test/confs/0046
index 554366907d95e15f451751b7f13e957573340951..4fb293e10fcf5f41310abb6b4760bdd1b9788997 100644 (file)
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -1,15 +1,13 @@
 # Exim test configuration 0046
 
 # Exim test configuration 0046
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
+NL=FALSE
+
+.include DIR/aux-var/std_conf_prefix
+

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

+message_body_newlines = NL

 message_id_header_domain = test.ex
 qualify_domain = test.ex
 # Omit Received: so as to keep the header size fixed
 message_id_header_domain = test.ex
 qualify_domain = test.ex
 # Omit Received: so as to keep the header size fixed


@@ -21,12 +19,6 @@ trusted_users = CALLER
 
 begin routers
 
 
 begin routers
 

-forwardfile:
-  driver = redirect
-  allow_filter
-  check_local_user
-  file = DIR/aux-fixed/TESTNUM.filter.$local_part
-

 localuser:
   driver = accept
   local_parts = userx
 localuser:
   driver = accept
   local_parts = userx


@@ -41,6 +33,7 @@ local_delivery:
   driver = appendfile
   envelope_to_add
   file = DIR/test-mail/$local_part
   driver = appendfile
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   headers_add = "X-size: $message_size\n\
                  X-body-size: $message_body_size\n\
                  X-body: $message_body\n\
   headers_add = "X-size: $message_size\n\
                  X-body-size: $message_body_size\n\
                  X-body: $message_body\n\