LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0552

diff --git a/test/confs/0552 b/test/confs/0552
index f676cd4a22fd2b4be01552cdc5cc009f2266af6b..ec138b93117728b251f39cb67fca8383df30f4fe 100644 (file)
--- a/test/confs/0552
+++ b/test/confs/0552
@@ -3,15 +3,9 @@
 DDF=
 SERVER=
 
 DDF=
 SERVER=
 

-exim_path = EXIM_PATH
-keep_environment =
-host_lookup_order = bydns
+.include DIR/aux-var/std_conf_prefix
+

 primary_hostname = myhost.test.ex
 primary_hostname = myhost.test.ex

-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

 
 # ----- Main settings -----
 
 
 # ----- Main settings -----
 


@@ -20,6 +14,7 @@ acl_smtp_connect = check_connect
 acl_smtp_rcpt = check_rcpt
 
 queue_only
 acl_smtp_rcpt = check_rcpt
 
 queue_only

+log_selector = +connection_id +received_recipients

 
 # ----- ACL -----
 
 
 # ----- ACL -----
 


@@ -52,6 +47,7 @@ begin transports
 t1:
   driver = smtp
   port = PORT_D
 t1:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

   hosts = 127.0.0.1
   allow_localhost
   command_timeout = 2s
   hosts = 127.0.0.1
   allow_localhost
   command_timeout = 2s