Merge from master into 4.next

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

diff --git a/test/confs/5820 b/test/confs/5820
index f1bd09d1caf96c0e92a7cfbe5d0a77c8e83fd46c..6c2f26ce062645b204966c84ef91639781f1c3c3 100644 (file)
--- a/test/confs/5820
+++ b/test/confs/5820
@@ -3,14 +3,9 @@
 
 SERVER=
 
-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/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
 
 # ----- Main settings -----