mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 15:45:25 +00:00
Code Issues Releases Wiki Activity

1488. [bug] Don't override trust levels for glue addresses.

Browse Source 
[RT #5764]
This commit is contained in:
Mark Andrews
2003-07-18 04:30:01 +00:00
parent c676c1b497
commit 4bb16c5856
3 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGES
View File

@@ -1,3 +1,6 @@
1488. [bug] Don't override trust levels for glue addresses.
[RT #5764]
1487. [bug] A REQUIRE() failure could be triggered if a zone was 1487. [bug] A REQUIRE() failure could be triggered if a zone was
queued for transfer and the zone was then removed. queued for transfer and the zone was then removed.
[RT #6189] [RT #6189]

13
lib/dns/adb.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: adb.c,v 1.203 2003/02/27 02:20:15 marka Exp $ */ /* $Id: adb.c,v 1.204 2003/07/18 04:30:01 marka Exp $ */
/* /*
* Implementation notes * Implementation notes
@@ -86,6 +86,7 @@
*/ */
#define ADB_CACHE_MINIMUM 10 /* seconds */ #define ADB_CACHE_MINIMUM 10 /* seconds */
#define ADB_CACHE_MAXIMUM 86400 /* seconds (86400 = 24 hours) */ #define ADB_CACHE_MAXIMUM 86400 /* seconds (86400 = 24 hours) */
#define ADB_ENTRY_WINDOW 1800 /* seconds */
/* /*
* Wake up every CLEAN_SECONDS and clean CLEAN_BUCKETS buckets, so that all * Wake up every CLEAN_SECONDS and clean CLEAN_BUCKETS buckets, so that all
@@ -572,6 +573,10 @@ import_rdataset(dns_adbname_t *adbname, dns_rdataset_t *rdataset,
if (addr_bucket != DNS_ADB_INVALIDBUCKET) if (addr_bucket != DNS_ADB_INVALIDBUCKET)
UNLOCK(&adb->entrylocks[addr_bucket]); UNLOCK(&adb->entrylocks[addr_bucket]);
if (rdataset->trust == dns_trust_glue ||
rdataset->trust == dns_trust_additional)
rdataset->ttl = ADB_CACHE_MINIMUM;
else
rdataset->ttl = ttlclamp(rdataset->ttl); rdataset->ttl = ttlclamp(rdataset->ttl);
if (rdtype == dns_rdatatype_a) { if (rdtype == dns_rdatatype_a) {
@@ -3336,6 +3341,7 @@ dns_adb_adjustsrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
{ {
int bucket; int bucket;
unsigned int new_srtt; unsigned int new_srtt;
isc_stdtime_t now;
REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(DNS_ADB_VALID(adb));
REQUIRE(DNS_ADBADDRINFO_VALID(addr)); REQUIRE(DNS_ADBADDRINFO_VALID(addr));
@@ -3353,6 +3359,9 @@ dns_adb_adjustsrtt(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
addr->entry->srtt = new_srtt; addr->entry->srtt = new_srtt;
addr->srtt = new_srtt; addr->srtt = new_srtt;
isc_stdtime_get(&now);
addr->entry->expires = now + ADB_ENTRY_WINDOW;
UNLOCK(&adb->entrylocks[bucket]); UNLOCK(&adb->entrylocks[bucket]);
} }
@@ -3450,7 +3459,7 @@ dns_adb_freeaddrinfo(dns_adb_t *adb, dns_adbaddrinfo_t **addrp) {
bucket = addr->entry->lock_bucket; bucket = addr->entry->lock_bucket;
LOCK(&adb->entrylocks[bucket]); LOCK(&adb->entrylocks[bucket]);
entry->expires = now + 1800; /* XXXRTH */ entry->expires = now + ADB_ENTRY_WINDOW;
want_check_exit = dec_entry_refcnt(adb, entry, ISC_FALSE); want_check_exit = dec_entry_refcnt(adb, entry, ISC_FALSE);

7
lib/dns/resolver.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: resolver.c,v 1.263 2003/04/11 07:25:25 marka Exp $ */ /* $Id: resolver.c,v 1.264 2003/07/18 04:30:01 marka Exp $ */
#include <config.h> #include <config.h>
@@ -3304,7 +3304,10 @@ cache_name(fetchctx_t *fctx, dns_name_t *name, isc_stdtime_t now) {
eresult = DNS_R_DNAME; eresult = DNS_R_DNAME;
} }
} }
if (rdataset->trust == dns_trust_glue) { if (rdataset->trust == dns_trust_glue &&
(rdataset->type == dns_rdatatype_ns ||
(rdataset->type == dns_rdatatype_sig &&
rdataset->covers == dns_rdatatype_ns))) {
/* /*
* If the trust level is 'dns_trust_glue' * If the trust level is 'dns_trust_glue'
* then we are adding data from a referral * then we are adding data from a referral