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

[master] SIT/max-cache-size flag collision

Browse Source 
3824.	[bug]		A collision between two flag values could cause
			problems with cache cleaning when SIT was enabled.
			[RT #35858]
This commit is contained in:
Evan Hunt
2014-04-28 10:24:39 -07:00
parent 76884179fd
commit e01fbe2a45
3 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@@ -1,3 +1,7 @@
3824. [bug] A collision between two flag values could cause
problems with cache cleaning when SIT was enabled.
[RT #35858]
3823. [func] Log the rpz cname target when rewriting. [RT #35667] 3823. [func] Log the rpz cname target when rewriting. [RT #35667]
3822. [bug] Log the correct type of static-stub zones when 3822. [bug] Log the correct type of static-stub zones when

5
lib/dns/adb.c
View File

@@ -357,7 +357,7 @@ static void dump_entry(FILE *, dns_adbentry_t *, isc_boolean_t, isc_stdtime_t);
* Private flag(s) for entries. * Private flag(s) for entries.
* MUST NOT overlap FCTX_ADDRINFO_xxx and DNS_FETCHOPT_NOEDNS0. * MUST NOT overlap FCTX_ADDRINFO_xxx and DNS_FETCHOPT_NOEDNS0.
*/ */
#define ENTRY_IS_DEAD 0x80000000 #define ENTRY_IS_DEAD 0x00400000
/* /*
* To the name, address classes are all that really exist. If it has a * To the name, address classes are all that really exist. If it has a
@@ -4041,6 +4041,9 @@ dns_adb_changeflags(dns_adb_t *adb, dns_adbaddrinfo_t *addr,
REQUIRE(DNS_ADB_VALID(adb)); REQUIRE(DNS_ADB_VALID(adb));
REQUIRE(DNS_ADBADDRINFO_VALID(addr)); REQUIRE(DNS_ADBADDRINFO_VALID(addr));
REQUIRE((bits & ENTRY_IS_DEAD) == 0);
REQUIRE((mask & ENTRY_IS_DEAD) == 0);
bucket = addr->entry->lock_bucket; bucket = addr->entry->lock_bucket;
LOCK(&adb->entrylocks[bucket]); LOCK(&adb->entrylocks[bucket]);

1
lib/dns/include/dns/resolver.h
View File

@@ -99,6 +99,7 @@ typedef struct dns_fetchevent {
#define DNS_FETCHOPT_PREFETCH 0x100 /*%< Request NSID */ #define DNS_FETCHOPT_PREFETCH 0x100 /*%< Request NSID */
#define DNS_FETCHOPT_NOCDFLAG 0x200 /*%< Don't set CD flag. */ #define DNS_FETCHOPT_NOCDFLAG 0x200 /*%< Don't set CD flag. */
/* Reserved in use by adb.c 0x00400000 */
#define DNS_FETCHOPT_EDNSVERSIONSET 0x00800000 #define DNS_FETCHOPT_EDNSVERSIONSET 0x00800000
#define DNS_FETCHOPT_EDNSVERSIONMASK 0xff000000 #define DNS_FETCHOPT_EDNSVERSIONMASK 0xff000000
#define DNS_FETCHOPT_EDNSVERSIONSHIFT 24 #define DNS_FETCHOPT_EDNSVERSIONSHIFT 24