LibreSSL: fixes pulled from OpenBSD patchset

[exim.git] / test / confs / 0495

diff --git a/test/confs/0495 b/test/confs/0495
index a9585e006fa9aa586ccd03b0046dd55c57a287c4..7a879288d7e69c76592bf9c7d51691de10c7a8b5 100644 (file)
--- a/test/confs/0495
+++ b/test/confs/0495
@@ -1,14 +1,8 @@
 # Exim test configuration 0495
 
 # Exim test configuration 0495
 

-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/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME
-tls_advertise_hosts =

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


@@ -70,6 +64,7 @@ t1:
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S
   driver = smtp
   hosts = 127.0.0.1 : HOSTIPV4
   port = PORT_S

+  hosts_try_fastopen = :

   allow_localhost
   command_timeout = 1s
 
   allow_localhost
   command_timeout = 1s
 


@@ -77,15 +72,18 @@ t2:
   driver = smtp
   hosts = V4NET.9.8.7
   port = PORT_S
   driver = smtp
   hosts = V4NET.9.8.7
   port = PORT_S

+  hosts_try_fastopen = :

 
 t3:
   driver = appendfile
   file = DIR/test-mail/$local_part
 
 t3:
   driver = appendfile
   file = DIR/test-mail/$local_part

+  create_file = DIR/test-mail

   user = CALLER
 
 t4:
   driver = smtp
   hosts = V4NET.10.10.10
   port = nonexistent
   user = CALLER
 
 t4:
   driver = smtp
   hosts = V4NET.10.10.10
   port = nonexistent

+  hosts_try_fastopen = :

 
 # End
 
 # End