Use dsn_from for success-DSN messages. Bug 2404

[exim.git] / test / confs / 5601

diff --git a/test/confs/5601 b/test/confs/5601
index 3e97fcbea325d0089e579b688e9222f694b88ba6..6e667b4299739fc0f97bc6edba83121aeb00680b 100644 (file)
--- a/test/confs/5601
+++ b/test/confs/5601
@@ -4,13 +4,14 @@
 SERVER =
 
 exim_path = EXIM_PATH
 SERVER =
 
 exim_path = EXIM_PATH

+keep_environment  = ^EXIM_TESTHARNESS_DISABLE_[O]CSPVALIDITYCHECK$

 host_lookup_order = bydns
 host_lookup_order = bydns

-primary_hostname = server1.example.com
-rfc1413_query_timeout = 0s

 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME
 spool_directory = DIR/spool
 log_file_path = DIR/spool/log/SERVER%slog
 gecos_pattern = ""
 gecos_name = CALLER_NAME

+chunking_advertise_hosts =
+primary_hostname = server1.example.com

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


@@ -20,7 +21,7 @@ domainlist local_domains = test.ex : *.test.ex
 acl_smtp_rcpt = check_recipient
 acl_smtp_data = check_data
 
 acl_smtp_rcpt = check_recipient
 acl_smtp_data = check_data
 

-log_selector = +tls_peerdn
+log_selector = +tls_peerdn +received_recipients

 remote_max_parallel = 1
 
 tls_advertise_hosts = *
 remote_max_parallel = 1
 
 tls_advertise_hosts = *


@@ -38,7 +39,7 @@ tls_privatekey = ${if eq {SERVER}{server}\
 {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\
 fail}
 
 {DIR/aux-fixed/exim-ca/example.com/server1.example.com/server1.example.com.unlocked.key}\
 fail}
 

-tls_ocsp_file = OCSP
+tls_ocsp_file = RETURN

 
 
 # ------ ACL ------
 
 
 # ------ ACL ------


@@ -90,6 +91,7 @@ send_to_server1:
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem

+  tls_verify_cert_hostnames =

   hosts_require_tls = *
   hosts_request_ocsp = :
   headers_add = X-TLS-out: ocsp status $tls_out_ocsp \
   hosts_require_tls = *
   hosts_request_ocsp = :
   headers_add = X-TLS-out: ocsp status $tls_out_ocsp \


@@ -102,6 +104,7 @@ send_to_server2:
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   hosts = HOSTIPV4
   port = PORT_D
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem

+  tls_verify_cert_hostnames =

   hosts_require_tls = *
 # note no ocsp mention here
   headers_add = X-TLS-out: ocsp status $tls_out_ocsp \
   hosts_require_tls = *
 # note no ocsp mention here
   headers_add = X-TLS-out: ocsp status $tls_out_ocsp \


@@ -115,6 +118,7 @@ send_to_server3:
   port = PORT_D
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   port = PORT_D
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem

+  tls_verify_cert_hostnames =

   hosts_require_tls =  *
   hosts_require_ocsp = *
   headers_add = X-TLS-out: ocsp status $tls_out_ocsp \
   hosts_require_tls =  *
   hosts_require_ocsp = *
   headers_add = X-TLS-out: ocsp status $tls_out_ocsp \


@@ -128,6 +132,7 @@ send_to_server4:
   port = PORT_D
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem
   port = PORT_D
   helo_data = helo.data.changed
   tls_verify_certificates = DIR/aux-fixed/exim-ca/example.com/CA/CA.pem

+  tls_verify_cert_hostnames =

   protocol =           smtps
   hosts_require_tls =  *
   hosts_require_ocsp = *
   protocol =           smtps
   hosts_require_tls =  *
   hosts_require_ocsp = *