dovecot-2.0: auth: Fixed assert-crash at deinit if there were cl...

[dovecot at dovecot.org]

details:   http://hg.dovecot.org/dovecot-2.0/rev/9a9f65bcbe19
changeset: 12448:9a9f65bcbe19
user:      Timo Sirainen <tss at iki.fi>
date:      Thu Nov 18 20:35:20 2010 +0000
description:
auth: Fixed assert-crash at deinit if there were clients left with pending auth requests.

diffstat:

 src/auth/auth-client-connection.c |  14 +++-----------
 1 files changed, 3 insertions(+), 11 deletions(-)

diffs (44 lines):

diff -r 8adacd9c03b2 -r 9a9f65bcbe19 src/auth/auth-client-connection.c
--- a/src/auth/auth-client-connection.c	Thu Nov 18 19:32:50 2010 +0000
+++ b/src/auth/auth-client-connection.c	Thu Nov 18 20:35:20 2010 +0000
@@ -319,9 +319,7 @@
 	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 @@
 	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_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 @@
 
 	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);
 }