X-Git-Url: https://git.exim.org/exim.git/blobdiff_plain/9e4dddbde4228e83fc7c882a4ef410ddbe0a6e79..65867078f62db450bd8f91100600f6de559e7590:/src/src/verify.c

diff --git a/src/src/verify.c b/src/src/verify.c
index c5ffdae4e..ea733b605 100644
--- a/src/src/verify.c
+++ b/src/src/verify.c
@@ -636,16 +636,12 @@ else
        /* STARTTLS accepted or ssl-on-connect: try to negotiate a TLS session. */
       else
         {
-        int rc = tls_client_start(inblock.sock, host, addr,
-  	 ob->tls_certificate, ob->tls_privatekey,
-  	 ob->tls_sni,
-  	 ob->tls_verify_certificates, ob->tls_crl,
-  	 ob->tls_require_ciphers,
-#ifdef EXPERIMENTAL_OCSP
-  	 ob->hosts_require_ocsp,
-#endif
-	 ob->tls_dh_min_bits, callout,
-         ob->tls_verify_hosts, ob->tls_try_verify_hosts);
+	int oldtimeout = ob->command_timeout;
+	int rc;
+
+	ob->command_timeout = callout;
+        rc = tls_client_start(inblock.sock, host, addr, ob);
+	ob->command_timeout = oldtimeout;
 
         /* TLS negotiation failed; give an error.  Try in clear on a new connection,
            if the options permit it for this host. */