Merge from master into 4.next

[users/heiko/exim.git] / test / confs / 0469

diff --git a/test/confs/0469 b/test/confs/0469
index 45901515c716751171c0486cef72d0a07a96fcf5..a008dde0002916bbc2fa00af5212857c22dc6091 100644 (file)
--- a/test/confs/0469
+++ b/test/confs/0469
@@ -2,14 +2,9 @@
 
 SRV=smtp
 
-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 -----