Merge branch 'master' into transp_logging_1031

[users/jgh/exim.git] / test / confs / 0046

diff --git a/test/confs/0046 b/test/confs/0046
index 554366907d95e15f451751b7f13e957573340951..c70121b3277e45de8e33ac71870c4dca6670171f 100644 (file)
--- a/test/confs/0046
+++ b/test/confs/0046
@@ -1,5 +1,7 @@
 # Exim test configuration 0046
 
 # Exim test configuration 0046
 

+NL=FALSE
+

 exim_path = EXIM_PATH
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s
 exim_path = EXIM_PATH
 host_lookup_order = bydns
 rfc1413_query_timeout = 0s


@@ -10,6 +12,7 @@ gecos_name = CALLER_NAME
 
 # ----- 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 +24,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