Merge from master into 4.next

[exim.git] / test / confs / 2119

diff --git a/test/confs/2119 b/test/confs/2119
index 3714f97c6db0600fbb16cdea702f133a578f0235..26ae4c1bcf7eff21262ccd6e6b131931427e6b20 100644 (file)
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -1,12 +1,8 @@
 # Exim test configuration 2119
 
 # Exim test configuration 2119
 

-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_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

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


@@ -42,6 +38,7 @@ check_recipient:
                      DHE-RSA-AES256-GCM-SHA384:\
                       DHE_RSA_AES_256_CBC_SHA1:\
                       DHE_RSA_3DES_EDE_CBC_SHA:\
                      DHE-RSA-AES256-GCM-SHA384:\
                       DHE_RSA_AES_256_CBC_SHA1:\
                       DHE_RSA_3DES_EDE_CBC_SHA:\

+                      ECDHE-RSA-AES256-GCM-SHA384:\

                       ECDHE-RSA-AES128-GCM-SHA256
   accept
 
                       ECDHE-RSA-AES128-GCM-SHA256
   accept