Fix string_copy() macro to not multiple-eval args. Bug 2603

[exim.git] / test / confs / 2119

diff --git a/test/confs/2119 b/test/confs/2119
index 646d506aaa36970b6d64cbfd172d06c8efbcdbcd..64987c8c0327bc461c78873b3d88f613272d5606 100644 (file)
--- a/test/confs/2119
+++ b/test/confs/2119
@@ -1,13 +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

-rfc1413_query_timeout = 0s
-spool_directory = DIR/spool
-log_file_path = DIR/spool/log/%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -34,15 +29,7 @@ begin acl
 check_recipient:
   accept  hosts = :
   deny    hosts = HOSTIPV4
 check_recipient:
   accept  hosts = :
   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:\
-                      DHE_RSA_3DES_EDE_CBC_SHA
+         !encrypted = *

   accept
 
 
   accept
 
 


@@ -62,7 +49,7 @@ begin transports
 
 local_delivery:
   driver = appendfile
 
 local_delivery:
   driver = appendfile

-  file = DIR/test-mail/$local_part
+  file = DIR/test-mail/${bless:$local_part}

   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER