Merge from master into 4.next

[exim.git] / test / confs / 0282

diff --git a/test/confs/0282 b/test/confs/0282
index 0952977ab3378503f8fcf5eef9a2baac6f8673ef..2660c7f7d7bc3e01f3f2d612b8e3efd19ee28257 100644 (file)
--- a/test/confs/0282
+++ b/test/confs/0282
@@ -1,13 +1,8 @@
 # Exim test configuration 0282
 
 # Exim test configuration 0282
 

-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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -33,6 +28,7 @@ local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
   user = CALLER
   driver = appendfile
   file = DIR/test-mail/$local_part
   user = CALLER

-  headers_add = interface-port: $interface_port
+  headers_add = interface-port: $interface_port\n\
+                received-port:  $received_port

 
 # End
 
 # End