- Don't attempt an RPZ delete for unsupported actions

This commit is contained in:
Ralph Dolmans
2019-04-25 19:02:17 +02:00
parent 83bf2fd253
commit 8dac8c00ce
+1 -9
View File
@@ -292,8 +292,6 @@ rpz_insert_qname_trigger(struct rpz* r, uint8_t* dname, size_t dnamelen,
return 0;
}
if(a == RPZ_LOCAL_DATA_ACTION) {
/* insert data. TODO synth wildcard cname target on
* lookup */
rrstr = sldns_wire2str_rr(rr, rr_len);
/* TODO non region alloc so rrs can be free after IXFR deletion?
* */
@@ -483,11 +481,10 @@ rpz_remove_rr(struct rpz* r, size_t aznamelen, uint8_t* dname,
return;
}
t = rpz_dname_to_trigger(policydname);
if(t == RPZ_QNAME_TRIGGER) {
if(a != RPZ_INVALID_ACTION && t != RPZ_QNAME_TRIGGER) {
z = rpz_find_zone(r, policydname, policydnamelen, rr_class,
1 /* only exact */, 1 /* wr lock */);
if(!z) {
/* TODO, not for SOA, NS, DNSSEC related RR types */
verbose(VERB_ALGO, "RPZ: cannot remove RR from IXFR, "
"RPZ domain not found");
free(policydname);
@@ -501,11 +498,6 @@ rpz_remove_rr(struct rpz* r, size_t aznamelen, uint8_t* dname,
local_zones_del_zone(r->local_zones, z);
}
}
else {
verbose(VERB_ALGO, "RPZ: skipping unusupported trigger: %s "
"while removing RPZ RRs",
rpz_trigger_to_string(t));
}
free(policydname);
}