From: Stephan Bosch <stephan.bosch@open-xchange.com>
Date: Fri, 21 Jan 2022 01:26:18 +0000 (+0100)
Subject: lib-smtp: smtp-client-connection - Move auth cleanup to separate function.
X-Git-Tag: 2.3.19~102
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=02e43414e017ff872f9f16c9aa3ce9ede60dafaa;p=thirdparty%2Fdovecot%2Fcore.git

lib-smtp: smtp-client-connection - Move auth cleanup to separate function.
---

diff --git a/src/lib-smtp/smtp-client-connection.c b/src/lib-smtp/smtp-client-connection.c
index 94f187cbca..43ff5ce72e 100644
--- a/src/lib-smtp/smtp-client-connection.c
+++ b/src/lib-smtp/smtp-client-connection.c
@@ -711,6 +711,12 @@ smtp_client_connection_clear_password(struct smtp_client_connection *conn)
 	conn->password = NULL;
 }
 
+static void
+smtp_client_connection_auth_deinit(struct smtp_client_connection *conn)
+{
+	dsasl_client_free(&conn->sasl_client);
+}
+
 static void
 smtp_client_connection_auth_cb(const struct smtp_reply *reply,
 			       struct smtp_client_connection *conn)
@@ -776,9 +782,9 @@ smtp_client_connection_auth_cb(const struct smtp_reply *reply,
 	}
 
 	smtp_client_connection_clear_password(conn);
+	smtp_client_connection_auth_deinit(conn);
 
 	e_debug(conn->event, "Authenticated successfully");
-	dsasl_client_free(&conn->sasl_client);
 
 	if (conn->to_connect != NULL)
 		timeout_reset(conn->to_connect);
@@ -2007,7 +2013,7 @@ void smtp_client_connection_disconnect(struct smtp_client_connection *conn)
 	ssl_iostream_destroy(&conn->ssl_iostream);
 	if (conn->ssl_ctx != NULL)
 		ssl_iostream_context_unref(&conn->ssl_ctx);
-	dsasl_client_free(&conn->sasl_client);
+	smtp_client_connection_auth_deinit(conn);
 
 	o_stream_destroy(&conn->dot_output);