mirror of
https://gitlab.isc.org/isc-projects/bind9
synced 2025-08-31 22:45:39 +00:00
Rename DNS_DB_NSEC_ constants to DNS_DBNAMESPACE_
Naming is hard exercise.
This commit is contained in:
@@ -316,7 +316,8 @@ dns_ntatable_add(dns_ntatable_t *ntatable, const dns_name_t *name, bool force,
|
||||
result = dns_qp_insert(qp, nta, 0);
|
||||
switch (result) {
|
||||
case ISC_R_EXISTS:
|
||||
result = dns_qp_getname(qp, &nta->name, 0, &pval, NULL);
|
||||
result = dns_qp_getname(qp, &nta->name, DNS_DBNAMESPACE_NORMAL,
|
||||
&pval, NULL);
|
||||
if (result == ISC_R_SUCCESS) {
|
||||
/*
|
||||
* an NTA already existed: throw away the
|
||||
@@ -355,7 +356,8 @@ dns_ntatable_delete(dns_ntatable_t *ntatable, const dns_name_t *name) {
|
||||
REQUIRE(name != NULL);
|
||||
|
||||
dns_qpmulti_write(ntatable->table, &qp);
|
||||
result = dns_qp_deletename(qp, name, 0, &pval, NULL);
|
||||
result = dns_qp_deletename(qp, name, DNS_DBNAMESPACE_NORMAL, &pval,
|
||||
NULL);
|
||||
if (result == ISC_R_SUCCESS) {
|
||||
dns__nta_t *n = pval;
|
||||
dns__nta_shutdown(n);
|
||||
@@ -379,7 +381,8 @@ delete_expired(void *arg) {
|
||||
|
||||
RWLOCK(&ntatable->rwlock, isc_rwlocktype_write);
|
||||
dns_qpmulti_write(ntatable->table, &qp);
|
||||
result = dns_qp_getname(qp, &nta->name, 0, &pval, NULL);
|
||||
result = dns_qp_getname(qp, &nta->name, DNS_DBNAMESPACE_NORMAL, &pval,
|
||||
NULL);
|
||||
if (result == ISC_R_SUCCESS &&
|
||||
((dns__nta_t *)pval)->expiry == nta->expiry && !nta->shuttingdown)
|
||||
{
|
||||
@@ -387,7 +390,8 @@ delete_expired(void *arg) {
|
||||
dns_name_format(&nta->name, nb, sizeof(nb));
|
||||
isc_log_write(DNS_LOGCATEGORY_DNSSEC, DNS_LOGMODULE_NTA,
|
||||
ISC_LOG_INFO, "deleting expired NTA at %s", nb);
|
||||
dns_qp_deletename(qp, &nta->name, 0, NULL, NULL);
|
||||
dns_qp_deletename(qp, &nta->name, DNS_DBNAMESPACE_NORMAL, NULL,
|
||||
NULL);
|
||||
dns__nta_shutdown(nta);
|
||||
dns__nta_unref(nta);
|
||||
}
|
||||
@@ -412,7 +416,8 @@ dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now,
|
||||
|
||||
RWLOCK(&ntatable->rwlock, isc_rwlocktype_read);
|
||||
dns_qpmulti_query(ntatable->table, &qpr);
|
||||
result = dns_qp_lookup(&qpr, name, 0, NULL, NULL, NULL, &pval, NULL);
|
||||
result = dns_qp_lookup(&qpr, name, DNS_DBNAMESPACE_NORMAL, NULL, NULL,
|
||||
NULL, &pval, NULL);
|
||||
nta = pval;
|
||||
|
||||
switch (result) {
|
||||
@@ -649,7 +654,7 @@ static size_t
|
||||
qp_makekey(dns_qpkey_t key, void *uctx ISC_ATTR_UNUSED, void *pval,
|
||||
uint32_t ival ISC_ATTR_UNUSED) {
|
||||
dns__nta_t *nta = pval;
|
||||
return dns_qpkey_fromname(key, &nta->name, 0);
|
||||
return dns_qpkey_fromname(key, &nta->name, DNS_DBNAMESPACE_NORMAL);
|
||||
}
|
||||
|
||||
static void
|
||||
|
Reference in New Issue
Block a user