Debug: "kill" option on ACL control=debug. Bug 1831

[exim.git] / test / confs / 2114

diff --git a/test/confs/2114 b/test/confs/2114
index c395c73e099cc6ca033813d2fae4eb2fd28cbe2f..d856e98bc904df76acb1ce9b2e93bf5a83af70d0 100644 (file)
--- a/test/confs/2114
+++ b/test/confs/2114
@@ -3,9 +3,9 @@
 CRL=
 
 exim_path = EXIM_PATH
 CRL=
 
 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,7 +36,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
 


@@ -58,7 +58,7 @@ 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
+  headers_add = TLS: cipher=$tls_cipher peerdn=$tls_in_peerdn

   user = CALLER
 
 # End
   user = CALLER
 
 # End