Merge from master into 4.next

[exim.git] / test / confs / 0383

diff --git a/test/confs/0383 b/test/confs/0383
index 8c5900caf57dfc1d08ff13b2ae282ca01999c2a7..ea2f1dc28df77c5b54981788c1e00e784b7d0543 100644 (file)
--- a/test/confs/0383
+++ b/test/confs/0383
@@ -1,13 +1,8 @@
 # Exim test configuration 0383
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 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 -----
 
@@ -24,7 +19,7 @@ r0:
   driver = redirect
   local_parts = redking
   allow_filter
-  file = DIR/aux-var/TESTNUM.f
+  file = DIR/aux-var/TESTNUM.F2
   user = CALLER
   pipe_transport = t1