Merge from master into 4.next

[exim.git] / test / confs / 0461

diff --git a/test/confs/0461 b/test/confs/0461
index 033082e892dbdc9d135f2d7adbcb503202f0e6a5..30abd50a9d3a5cd8dc4528c11fb33a47f2a6d33e 100644 (file)
--- a/test/confs/0461
+++ b/test/confs/0461
@@ -5,13 +5,9 @@ ROUTE_DATA=V4NET.0.0.1
 RETRY1=1s
 RETRY2=2s
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 
 # ----- Main settings -----