upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-22 10:10:14 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Revert NTA flush on expire

Browse source 
Flushing the name when NTA expires causes problems for the ongoing
resolving process. Do not flush the name from the cache. Instead,
the resolver should do the flushing (this is planned to be merged
next).
This commit is contained in:
Aram Sargsyan 2026-03-30 12:11:46 +00:00 committed by Arаm Sаrgsyаn
parent 3b9ad92cdd
commit 357331f886
2 changed files with 0 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/tests/system/nta/tests_nta.py
View file

@ -147,13 +147,6 @@ def test_nta_behavior(servers):
isctest.check.noerror(res)
isctest.check.noadflag(res)
# Expiry should also trigger a cache flush, so even if a.secure.example A
# was cached when its NTA was active, cached data should not be returned.
m = isctest.query.create("a.secure.example", "A")
res = isctest.query.tcp(m, "10.53.0.4")
isctest.check.noerror(res)
isctest.check.adflag(res)
# bogus.example was set to expire in 20s, so at t=13
# it should still be NTA'd, but badds.example used the default
# lifetime of 12s, so it should revert to SERVFAIL now.

6
lib/dns/nta.c
View file

@ -414,7 +414,6 @@ dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now,
bool answer = false;
dns_qpread_t qpr;
void *pval = NULL;
bool flushnode = false;
REQUIRE(VALID_NTATABLE(ntatable));
REQUIRE(dns_name_isabsolute(name));
@ -454,7 +453,6 @@ dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now,
/* NTA is expired */
dns__nta_ref(nta);
dns_ntatable_ref(nta->ntatable);
flushnode = true;
isc_async_run(nta->loop, delete_expired, nta);
goto done;
}
@ -462,10 +460,6 @@ dns_ntatable_covered(dns_ntatable_t *ntatable, isc_stdtime_t now,
answer = true;
done:
dns_qpread_destroy(table, &qpr);
if (nta != NULL && flushnode) {
dns_view_flushnode(view, &nta->name, true);
}
unlock:
rcu_read_unlock();