ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

check insist on every call; make conditional block constistent with rest of code

Browse Source
This commit is contained in:
Mark Andrews
2018-03-06 10:48:21 +11:00
committed by Evan Hunt
parent 55049d02dc
commit f1def91625
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
lib/ns/query.c
View File

@@ -3878,6 +3878,10 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype,
rpz_ver = rpzs->rpz_ver;
RWUNLOCK(&rpzs->search_lock, isc_rwlocktype_read);
#ifndef USE_DNSRPS
INSIST(!popt.dnsrps_enabled);
#endif
if (st == NULL) {
st = isc_mem_get(client->mctx, sizeof(*st));
if (st == NULL)
@@ -3903,8 +3907,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype,
st->popt = popt;
st->rpz_ver = rpz_ver;
client->query.rpz_st = st;
if (popt.dnsrps_enabled) {
#ifdef USE_DNSRPS
if (popt.dnsrps_enabled) {
if (st->rpsdb != NULL) {
dns_db_detach(&st->rpsdb);
}
@@ -3919,10 +3923,8 @@ rpz_rewrite(ns_client_t *client, dns_rdatatype_t qtype,
st->m.policy = DNS_RPZ_POLICY_ERROR;
return (ISC_R_SUCCESS);
}
#else
INSIST(0);
#endif
}
#endif
}
/*