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

[exim.git] / test / confs / 2027

diff --git a/test/confs/2027 b/test/confs/2027
index 6429fec7dbde75fab77aa94bdbd9a6a243c37503..926b09a57aa4da658f56f389c4940a90d3332656 100644 (file)
--- a/test/confs/2027
+++ b/test/confs/2027
@@ -2,14 +2,9 @@
 
 SERVER =
 
 
 SERVER =
 

-exim_path = EXIM_PATH
-keep_environment =
-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/SERVER%slog
-gecos_pattern = ""
-gecos_name = CALLER_NAME

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


@@ -47,14 +42,16 @@ 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
 
 send_to_server:
   headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
   user = CALLER
 
 send_to_server:

-  driver = smtp
+  driver =     smtp

   allow_localhost
   allow_localhost

-  hosts = ${if eq{$local_part}{userx}{127.0.0.1}{HOSTIPV4}}
-  port = PORT_D
+  hosts =      ${if eq{$local_part}{userx}{127.0.0.1}{HOSTIPV4}}
+  port =       PORT_D
+  tls_verify_certificates =    DIR/aux-fixed/cert1
+  tls_verify_cert_hostnames =  :

 
 # End
 
 # End