Fix sieve QP regression from Coverity cleanups

[users/jgh/exim.git] / test / confs / 5840

diff --git a/test/confs/5840 b/test/confs/5840
index cd9e8b9c38e08420f4e952e379f8c2754cc8b7ae..01c114252a5c52d45daa6196d7d146d095a2c1d9 100644 (file)
--- a/test/confs/5840
+++ b/test/confs/5840
@@ -3,17 +3,17 @@
 
 SERVER=
 
-exim_path = EXIM_PATH
-host_lookup_order = bydns
+.include DIR/aux-var/tls_conf_prefix
+
 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 -----
 
+.ifndef OPT
 acl_smtp_rcpt = accept
+.else
+acl_smtp_rcpt = accept verify = recipient/callout
+.endif
 
 log_selector =  +received_recipients +tls_peerdn +tls_certificate_verified
 
@@ -47,6 +47,7 @@ client:
   dnssec_request_domains = *
   self = send
   transport = send_to_server
+  errors_to = ""
 
 server:
   driver = redirect
@@ -60,13 +61,10 @@ begin transports
 send_to_server:
   driver = smtp
   allow_localhost
-  port = PORT_D
+  port = ${if match {$host}{\Ntest.ex$\N} {PORT_D}{25}}
 
   hosts_try_dane =     *
-  hosts_require_dane = !thishost.test.ex
-  hosts_request_ocsp = ${if or { {= {4}{$tls_out_tlsa_usage}} \
-                                {= {0}{$tls_out_tlsa_usage}} } \
-                        {*}{}}
+  hosts_require_dane = HOSTIPV4
   tls_verify_cert_hostnames = ${if eq {OPT}{no_certname} {}{*}}
   tls_try_verify_hosts = thishost.test.ex
   tls_verify_certificates = CDIR2/ca_chain.pem