Skip to content

Clear flags and avoid leaks in RBL handling #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mannfredcom wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Clear flags and avoid leaks in RBL handling #12

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions src/s_auth.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -586,8 +586,13 @@ rbl_set_aftype(rbl_t *t, bool isv4, bool isv6)
{
if(isv4 == true)
rbl_setv4(t);
if(isv4 == true)
else
rbl_clearv4(t);

if(isv6 == true)
rbl_setv6(t);
else
rbl_clearv6(t);
}

rbl_t *
Expand All @@ -612,6 +617,7 @@ rbl_set_match_other(rbl_t *t, bool other_reply)
void
rbl_add_other_answer(rbl_t *t, const char *reason)
{
rb_free(t->mo_answer);
t->mo_answer = rb_strdup(reason);
rbl_setmatchother(t); /* make sure this gets done */
}
Expand Down Expand Up @@ -770,6 +776,7 @@ rbl_set_banned(struct AuthRequest *auth, const char *rblname, const char *answer
substitution_append_var(&varlist, "host", EmptyString(source_p->host) ? source_p->sockhost : source_p->host);
substitution_append_var(&varlist, "dnsbl-host", rblname);
substitution_append_var(&varlist, "network-name", ServerInfo.network_name);
rb_free(source_p->localClient->rblreason);
source_p->localClient->rblreason = rb_strdup(substitution_parse(answer, &varlist));
substitution_free(&varlist);
SetRBLBanned(source_p);
Expand Down Expand Up @@ -860,10 +867,11 @@ rbl_check_rbls(struct AuthRequest *auth)
if(safamily == AF_INET && rbl_isv4(t) != true)
continue;

if(rbl_string((struct sockaddr *)&auth->client->localClient->ip, t->rblname, hostbuf, sizeof(hostbuf)) == NULL)
continue;

query = rb_malloc(sizeof(rblquery_t));
query->auth = auth;
rbl_string((struct sockaddr *)&auth->client->localClient->ip, t->rblname, hostbuf, sizeof(hostbuf));
rbl_attach_rbl_to_query(query, t);
rb_dlinkAdd(query, &query->node, &auth->rbl_queries);
query->queryid = lookup_hostname(hostbuf, AF_INET, rbl_dns_callback, query);
Expand Down Expand Up @@ -916,4 +924,3 @@ rbl_cancel_lookups(struct AuthRequest *auth)
}