Merge branch '4.next'

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

diff --git a/test/confs/4804 b/test/confs/4804
index a1ba90dd148ad3e45598b958692cea4bf19a47ed..1513d46882bf932e65dc84e4b0ef48ddbf373690 100644 (file)
--- a/test/confs/4804
+++ b/test/confs/4804
@@ -3,22 +3,16 @@
 SERVER=
 OPT=
 
 SERVER=
 OPT=
 

-exim_path = EXIM_PATH
-keep_environment =
-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
+.include DIR/aux-var/std_conf_prefix
+

 timezone = UTC
 timezone = UTC

+primary_hostname = myhost.test.ex

 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 log_selector = OPT
 
 # ----- Main settings -----
 
 acl_smtp_rcpt = accept
 
 log_selector = OPT

-tls_advertise_hosts = :

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


@@ -46,5 +40,6 @@ begin transports
 send_to_server:
   driver = smtp
   port = PORT_D
 send_to_server:
   driver = smtp
   port = PORT_D

+  hosts_try_fastopen = :

 
 # End
 
 # End