mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-08-22 10:10:06 +00:00
Code Issues Releases Wiki Activity

fix: usr: 'Recursive-clients 0;' triggers an assertion

Browse Source 
BIND 9.20.0 broke `recursive-clients 0;`.  This has now been fixed.

Closes #4987

Merge branch '4987-fix-recursive-clients-0' into 'main'

See merge request isc-projects/bind9!9621
This commit is contained in:
Mark Andrews 2024-10-17 06:43:25 +00:00
commit d7fab54393
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
bin/tests/system/resolver/ns9/named.conf.in
View File

@ -19,6 +19,7 @@ options {
listen-on { none; }; listen-on { none; };
listen-on-v6 { fd92:7065:b8e:ffff::9; }; listen-on-v6 { fd92:7065:b8e:ffff::9; };
recursion yes; recursion yes;
recursive-clients 0; // regression test for [GL #4987]
dnssec-validation yes; dnssec-validation yes;
dual-stack-servers { fd92:7065:b8e:ffff::7; }; dual-stack-servers { fd92:7065:b8e:ffff::7; };
qname-minimization off; qname-minimization off;

1
lib/isc/quota.c
View File

@ -36,7 +36,6 @@ isc_quota_init(isc_quota_t *quota, unsigned int max) {
void void
isc_quota_soft(isc_quota_t *quota, unsigned int soft) { isc_quota_soft(isc_quota_t *quota, unsigned int soft) {
REQUIRE(VALID_QUOTA(quota)); REQUIRE(VALID_QUOTA(quota));
REQUIRE(atomic_load_relaxed(&quota->max) > soft);
atomic_store_relaxed(&quota->soft, soft); atomic_store_relaxed(&quota->soft, soft);
} }

5
tests/isc/quota_test.c
View File

@ -53,6 +53,11 @@ ISC_RUN_TEST_IMPL(isc_quota_get_set) {
assert_int_equal(isc_quota_getused(&quota), 1); assert_int_equal(isc_quota_getused(&quota), 1);
isc_quota_release(&quota); isc_quota_release(&quota);
assert_int_equal(isc_quota_getused(&quota), 0); assert_int_equal(isc_quota_getused(&quota), 0);
/* Unlimited */
isc_quota_max(&quota, 0);
isc_quota_soft(&quota, 0);
isc_quota_destroy(&quota); isc_quota_destroy(&quota);
} }