From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Sun, 24 Jun 2018 19:30:23 +0000 (+0100)
Subject: Fix mutiple message send under TLS
X-Git-Tag: exim-4.92-RC1~161
X-Git-Url: https://vcs.fsf.org/?p=exim.git;a=commitdiff_plain;h=c645dd29e7f9fcb7e3d2fd9f20aa47084ba0221e

Fix mutiple message send under TLS

Broken-by: 74f1a42304
---

diff --git a/src/src/transports/smtp.c b/src/src/transports/smtp.c
index 1f0256f3d..1631817d9 100644
--- a/src/src/transports/smtp.c
+++ b/src/src/transports/smtp.c
@@ -2717,6 +2717,7 @@ for (fd_bits = 3; fd_bits; )
       {
       fd_bits = 0;
       tls_close(ct_ctx, TLS_SHUTDOWN_NOWAIT);
+      ct_ctx = NULL;
       }
     else
       {
@@ -3541,6 +3542,7 @@ if (sx.completed_addr && sx.ok && sx.send_quit)
 	  the socket on. */
 
 	  tls_close(sx.cctx.tls_ctx, TLS_SHUTDOWN_WAIT);
+	  sx.cctx.tls_ctx = NULL;
 	  smtp_peer_options = smtp_peer_options_wrap;
 	  sx.ok = !sx.smtps
 	    && smtp_write_command(&sx.outblock, SCMD_FLUSH,
@@ -3654,6 +3656,7 @@ END_OFF:
 
 #ifdef SUPPORT_TLS
 tls_close(sx.cctx.tls_ctx, TLS_SHUTDOWN_NOWAIT);
+sx.cctx.tls_ctx = NULL;
 #endif
 
 /* Close the socket, and return the appropriate value, first setting