From: Stephan Bosch <stephan.bosch@dovecot.fi>
Date: Sun, 11 Nov 2018 19:41:18 +0000 (+0100)
Subject: lib-smtp: client: Properly reset connection state upon reconnect.
X-Git-Tag: 2.3.5~8
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=cd7ea3c820231e9b36b7f405a95a3becf96c723b;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: client: Properly reset connection state upon reconnect.
---

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index c4591189e3..03263a2b8c 100644
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -1549,8 +1549,9 @@ smtp_client_connection_do_connect(struct smtp_client_connection *conn)
 {
 	unsigned int msecs;
 
-	conn->connect_failed = FALSE;
-	conn->handshake_failed = FALSE;
+	if (conn->closed || conn->failing)
+		return;
+
 	if (connection_client_connect(&conn->conn) < 0) {
 		smtp_client_connection_connected(&conn->conn, FALSE);
 		return;
@@ -1715,7 +1716,17 @@ void smtp_client_connection_connect(struct smtp_client_connection *conn,
 		return;
 	}
 
+	if (conn->closed || conn->failing)
+		return;
+
 	conn->xclient_replies_expected = 0;
+	conn->authenticated = FALSE;
+	conn->xclient_sent = FALSE;
+	conn->connect_failed = FALSE;
+	conn->connect_succeeded = FALSE;
+	conn->handshake_failed = FALSE;
+	conn->sent_quit = FALSE;
+	conn->reset_needed = FALSE;
 
 	i_assert(conn->login_callback == NULL);
 	conn->login_callback = login_callback;