Merge from master into 4.next

[exim.git] / test / confs / 0465

diff --git a/test/confs/0465 b/test/confs/0465
index 877e04487be6d890e5f283320070e6a248989b41..9fc5579df39d3f2a1c5bc7e11db3cce5222751a7 100644 (file)
--- a/test/confs/0465
+++ b/test/confs/0465
@@ -1,15 +1,10 @@
 # Exim test configuration 0465
 
-STD=
+OPT=
+
+.include DIR/aux-var/std_conf_prefix
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
 primary_hostname = myhost.test.ex
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =
 
 # ----- Main settings -----
 
@@ -17,7 +12,7 @@ acl_smtp_rcpt = accept
 acl_smtp_data = check_data
 queue_only
 trusted_users = CALLER
-STD
+OPT
 
 
 begin acl