From: Timo Sirainen <tss@iki.fi>
Date: Thu, 18 Nov 2010 20:35:20 +0000 (+0000)
Subject: auth: Fixed assert-crash at deinit if there were clients left with pending auth requests.
X-Git-Tag: 2.0.8~63
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2e0eb7bb28ee0e458534aa59bd799dcca61a5c35;p=thirdparty%2Fdovecot%2Fcore.git

auth: Fixed assert-crash at deinit if there were clients left with pending auth requests.
---

diff --git a/src/auth/auth-client-connection.c b/src/auth/auth-client-connection.c
index 0fd46697fb..b626ee156c 100644
--- a/src/auth/auth-client-connection.c
+++ b/src/auth/auth-client-connection.c
@@ -319,9 +319,7 @@ auth_client_connection_create(struct auth *auth, int fd, bool login_requests)
 	return conn;
 }
 
-static void
-auth_client_connection_destroy_full(struct auth_client_connection **_conn,
-				    bool abort_requests)
+void auth_client_connection_destroy(struct auth_client_connection **_conn)
 {
         struct auth_client_connection *conn = *_conn;
 	struct auth_client_connection *const *clients;
@@ -350,8 +348,7 @@ auth_client_connection_destroy_full(struct auth_client_connection **_conn,
 	conn->fd = -1;
 
 	if (conn->request_handler != NULL) {
-		if (abort_requests)
-			auth_request_handler_abort_requests(conn->request_handler);
+		auth_request_handler_abort_requests(conn->request_handler);
 		auth_request_handler_destroy(&conn->request_handler);
 	}
 
@@ -359,11 +356,6 @@ auth_client_connection_destroy_full(struct auth_client_connection **_conn,
         auth_client_connection_unref(&conn);
 }
 
-void auth_client_connection_destroy(struct auth_client_connection **_conn)
-{
-	auth_client_connection_destroy_full(_conn, TRUE);
-}
-
 static void auth_client_connection_unref(struct auth_client_connection **_conn)
 {
         struct auth_client_connection *conn = *_conn;
@@ -404,6 +396,6 @@ void auth_client_connections_deinit(void)
 
 	clients = array_get_modifiable(&auth_client_connections, &count);
 	for (i = count; i > 0; i--)
-		auth_client_connection_destroy_full(&clients[i-1], FALSE);
+		auth_client_connection_destroy(&clients[i-1]);
 	array_free(&auth_client_connections);
 }