Merge from master into 4.next

[users/jgh/exim.git] / test / confs / 0525

diff --git a/test/confs/0525 b/test/confs/0525
index f30696241ed2e34ebf1df5c84612e0f6ee05a984..a6e429172bc08c5bd6e70de21e6650a5c49f24c9 100644 (file)
--- a/test/confs/0525
+++ b/test/confs/0525
@@ -1,13 +1,8 @@
 # Exim test configuration 0525
 
-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 -----
 
@@ -37,7 +32,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1
   port = PORT_S
-  interface = 127.0.0.1
   allow_localhost
   data_timeout = 1s