shift queue name use up to top layer in spooldir hierachy

[users/heiko/exim.git] / test / confs / 2119

diff --git a/test/confs/2119 b/test/confs/2119
index 31f143c5745c0f030b761ab2f555a3dbb2df5265..f4c2286503a9f300cd687434fe0823d0fa5399c7 100644 (file)
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -1,9 +1,9 @@
 # Exim test configuration 2119
 
 exim_path = EXIM_PATH
 # Exim test configuration 2119
 
 exim_path = EXIM_PATH

+keep_environment =

 host_lookup_order = bydns
 primary_hostname = myhost.test.ex
 host_lookup_order = bydns
 primary_hostname = myhost.test.ex

-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/%slog
 gecos_pattern = ""


@@ -36,12 +36,15 @@ check_recipient:
   deny    hosts = HOSTIPV4
          !encrypted = AES256-SHA:\
                       AES256-GCM-SHA384:\
   deny    hosts = HOSTIPV4
          !encrypted = AES256-SHA:\
                       AES256-GCM-SHA384:\

+                      AES128-GCM-SHA256:\

                       IDEA-CBC-MD5:\
                       DES-CBC3-SHA:\
                      DHE-RSA-AES256-SHA:\
                      DHE-RSA-AES256-GCM-SHA384:\
                       DHE_RSA_AES_256_CBC_SHA1:\
                       IDEA-CBC-MD5:\
                       DES-CBC3-SHA:\
                      DHE-RSA-AES256-SHA:\
                      DHE-RSA-AES256-GCM-SHA384:\
                       DHE_RSA_AES_256_CBC_SHA1:\

-                      DHE_RSA_3DES_EDE_CBC_SHA
+                      DHE_RSA_3DES_EDE_CBC_SHA:\
+                      ECDHE-RSA-AES256-GCM-SHA384:\
+                      ECDHE-RSA-AES128-GCM-SHA256

   accept
 
 
   accept