LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0006

diff --git a/test/confs/0006 b/test/confs/0006
index d362deec32dfb4632d845d28629e39c3bdab4fd7..337dfa31a3d39253929cf213654ed0dd9092a55d 100644 (file)
--- a/test/confs/0006
+++ b/test/confs/0006
@@ -1,17 +1,13 @@
 # Exim test configuration 0006
 
 # Exim test configuration 0006
 

-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
+.include DIR/aux-var/std_conf_prefix
+

 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 trusted_users = CALLER
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 trusted_users = CALLER

+log_selector = +smtp_no_mail

 
 
 # ----- Routers -----
 
 
 # ----- Routers -----


@@ -40,8 +36,10 @@ local_delivery:
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part
   delivery_date_add
   envelope_to_add
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   return_path_add
   return_path_add

-  headers_add = \nMessage Headers:\n$message_headers\n
+  headers_add = \nMessage Headers:\n$message_headers\n\
+                \nRaw Message Headers:\n$message_headers_raw\n

 
 address_file:
   driver = appendfile
 
 address_file:
   driver = appendfile