vulpineawoo/solanum
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Abort blacklist queries at the same time as auth queries.

Browse source 
This fixes an assert(MyConnect(...)) being hit in
register_local_user(...).
This commit is contained in:
Keith Buck 2013-09-12 08:21:50 +00:00
parent 77d3d2dbaf
commit 7fc09bc4f0
1 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/client.c
View file

@ -193,7 +193,8 @@ free_pre_client(struct Client *client_p)
blptr = client_p->preClient->dnsbl_listed; blptr = client_p->preClient->dnsbl_listed;
if (blptr != NULL) if (blptr != NULL)
unref_blacklist(blptr); 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); rb_bh_free(pclient_heap, client_p->preClient);
client_p->preClient = NULL; client_p->preClient = NULL;
} }
@ -1258,6 +1259,7 @@ exit_unknown_client(struct Client *client_p, struct Client *source_p, struct Cli
const char *comment) const char *comment)
{ {
delete_auth_queries(source_p); delete_auth_queries(source_p);
abort_blacklist_queries(source_p);
if (source_p->localClient->dnsquery) if (source_p->localClient->dnsquery)
{ {
delete_resolver_queries(source_p->localClient->dnsquery); delete_resolver_queries(source_p->localClient->dnsquery);