Merge from master into 4.next

[exim.git] / test / confs / 0495

diff --git a/test/confs/0495 b/test/confs/0495
index b33cbf1ef89f50a617e5155aa16a06aac21328ec..5bfec709fce870b38175255250d505967d2ac69c 100644 (file)
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -1,13 +1,8 @@
 # Exim test configuration 0495
 
-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 -----
 
@@ -69,7 +64,6 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
-  interface = ${if eq {$host}{127.0.0.1} {127.0.0.1}}
   allow_localhost
   command_timeout = 1s