upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-11 12:20:00 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix DNSRPS code after struct dns_db refactoring

Browse source 
Commits ffa4757c79 and
77e7eac54c inadvertently broke
DNSRPS-enabled builds:

  - the new member of struct dns_db that holds a reference count for the
    database is called 'references', not 'refcount',

  - a syntax error was introduced in the designated initializer for
    'rpsdb_rdataset_methods',

  - rpsdb_destroy() no longer takes a 'dbp' argument.

Address all of the above issues to make DNSRPS-enabled builds work
again.
This commit is contained in:
Michał Kępień 2023-02-28 09:16:05 +01:00
parent cdbdb5fcec
commit df3062ed52
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/dns/dnsrps.c
View file

@ -265,7 +265,7 @@ dns_dnsrps_rewrite_init(librpz_emsg_t *emsg, dns_rpz_st_t *st,
},
.qname = qname,
};
isc_refcount_init(&rpsdb->common.refcount, 1);
isc_refcount_init(&rpsdb->common.references, 1);
if (!librpz->rsp_create(emsg, &rpsdb->rsp, NULL, rpzs->rps_client,
have_rd, false))
@ -367,10 +367,8 @@ rpsdb_destroy(dns_db_t *db) {
REQUIRE(VALID_RPSDB(rpsdb));
*dbp = NULL;
librpz->rsp_detach(&rpsdb->rsp);
isc_refcount_destroy(&rpsdb->common.refcount);
isc_refcount_destroy(&rpsdb->common.references);
rpsdb->common.impmagic = 0;
isc_mem_putanddetach(&rpsdb->common.mctx, rpsdb, sizeof(*rpsdb));
}
@ -383,7 +381,7 @@ rpsdb_attachnode(dns_db_t *db, dns_dbnode_t *source, dns_dbnode_t **targetp) {
REQUIRE(targetp != NULL && *targetp == NULL);
REQUIRE(source == &rpsdb->origin_node || source == &rpsdb->data_node);
isc_refcount_increment(&rpsdb->common.refcount);
isc_refcount_increment(&rpsdb->common.references);
*targetp = source;
}
@ -921,7 +919,7 @@ static dns_dbmethods_t rpsdb_db_methods = {
static dns_rdatasetmethods_t rpsdb_rdataset_methods = {
.disassociate = rpsdb_rdataset_disassociate,
first = rpsdb_rdataset_first,
.first = rpsdb_rdataset_first,
.next = rpsdb_rdataset_next,
.current = rpsdb_rdataset_current,
.clone = rpsdb_rdataset_clone,