From 7fc09bc4f0be58ad5946c07576a038911fd6f5f1 Mon Sep 17 00:00:00 2001
From: Keith Buck <mr_flea@esper.net>
Date: Thu, 12 Sep 2013 08:21:50 +0000
Subject: [PATCH] Abort blacklist queries at the same time as auth queries.

This fixes an assert(MyConnect(...)) being hit in
register_local_user(...).
---
 src/client.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/client.c b/src/client.c
index 7fbfc4e5..23436ab7 100644
--- a/src/client.c
+++ b/src/client.c
@@ -193,7 +193,8 @@ free_pre_client(struct Client *client_p)
 	blptr = client_p->preClient->dnsbl_listed;
 	if (blptr != NULL)
 		unref_blacklist(blptr);
-	abort_blacklist_queries(client_p);
+	s_assert(rb_dlink_list_length(&client_p->preClient->dnsbl_queries) == 0);
+
 	rb_bh_free(pclient_heap, client_p->preClient);
 	client_p->preClient = NULL;
 }
@@ -1258,6 +1259,7 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
 		  const char *comment)
 {
 	delete_auth_queries(source_p);
+	abort_blacklist_queries(source_p);
 	if (source_p->localClient->dnsquery)
 	{
 		delete_resolver_queries(source_p->localClient->dnsquery);