refactor

[exim.git] / test / confs / 2014

diff --git a/test/confs/2014 b/test/confs/2014
index f9e2e6a221d3918a0edcba01d05997ff809eaec8..11f6512250aa4cbfe90aeae06f8696f99af5847f 100644 (file)
--- a/test/confs/2014
+++ b/test/confs/2014
@@ -22,7 +22,7 @@ tls_privatekey = DIR/aux-fixed/cert1
 
 tls_verify_hosts = HOSTIPV4
 tls_try_verify_hosts = *
 
 tls_verify_hosts = HOSTIPV4
 tls_try_verify_hosts = *

-tls_verify_certificates = DIR/aux-fixed/cert2
+tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/server1.example.com/ca_chain.pem

 tls_crl = CRL
 
 
 tls_crl = CRL
 
 


@@ -31,7 +31,7 @@ tls_crl = CRL
 begin acl
 
 check_recipient:
 begin acl
 
 check_recipient:

-  deny     message = certificate not verified: peerdn=$tls_peerdn
+  deny     message = certificate not verified: peerdn=$tls_in_peerdn

          ! verify = certificate
   accept
 
          ! verify = certificate
   accept
 


@@ -53,7 +53,8 @@ begin transports
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part
 local_delivery:
   driver = appendfile
   file = DIR/test-mail/$local_part

-  headers_add = TLS: cipher=$tls_cipher peerdn=$tls_peerdn
+  create_file = DIR/test-mail
+  headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn

   user = CALLER
 
 # End
   user = CALLER
 
 # End