Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
BIND
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Joey Salazar
BIND
Commits
7baa39fc
Commit
7baa39fc
authored
Oct 06, 2017
by
Evan Hunt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[master] it's okay if dns_db_setgluecachestats() returns ISC_R_NOTIMPLEMENTED
parent
4101e6d3
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
41 additions
and
35 deletions
+41
-35
bin/tests/system/dyndb/driver/db.c
bin/tests/system/dyndb/driver/db.c
+7
-7
lib/dns/db.c
lib/dns/db.c
+2
-1
lib/dns/rbtdb.c
lib/dns/rbtdb.c
+21
-21
lib/dns/sdb.c
lib/dns/sdb.c
+3
-3
lib/dns/sdlz.c
lib/dns/sdlz.c
+1
-1
lib/dns/zone.c
lib/dns/zone.c
+7
-2
No files found.
bin/tests/system/dyndb/driver/db.c
View file @
7baa39fc
...
...
@@ -599,17 +599,17 @@ static dns_dbmethods_t sampledb_methods = {
resigned
,
isdnssec
,
getrrsetstats
,
NULL
,
NULL
,
NULL
,
/* rpz_attach */
NULL
,
/* rpz_ready */
findnodeext
,
findext
,
setcachestats
,
hashsize
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
NULL
,
/* nodefullname */
NULL
,
/* getsize */
NULL
,
/* setservestalettl */
NULL
,
/* getservestalettl */
NULL
/* setgluecachestats */
};
/* Auxiliary driver functions. */
...
...
lib/dns/db.c
View file @
7baa39fc
...
...
@@ -1153,8 +1153,9 @@ dns_db_setgluecachestats(dns_db_t *db, isc_stats_t *stats) {
REQUIRE
(
dns_db_iszone
(
db
));
REQUIRE
(
stats
!=
NULL
);
if
(
db
->
methods
->
setgluecachestats
!=
NULL
)
if
(
db
->
methods
->
setgluecachestats
!=
NULL
)
{
return
((
db
->
methods
->
setgluecachestats
)(
db
,
stats
));
}
return
(
ISC_R_NOTIMPLEMENTED
);
}
lib/dns/rbtdb.c
View file @
7baa39fc
...
...
@@ -8278,24 +8278,24 @@ static dns_dbmethods_t zone_methods = {
overmem,
settask,
getoriginnode,
NULL
,
NULL,
/* transfernode */
getnsec3parameters,
findnsec3node,
setsigningtime,
getsigningtime,
resigned,
isdnssec,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL,
/* getrrsetstats */
NULL,
/* rpz_attach */
NULL,
/* rpz_ready */
NULL,
/* findnodeext */
NULL,
/* findext */
NULL,
/* setcachestats */
hashsize,
nodefullname,
getsize,
NULL
,
NULL
,
NULL,
/* setservestalettl */
NULL,
/* getservestalettl */
setgluecachestats
};
...
...
@@ -8304,7 +8304,7 @@ static dns_dbmethods_t cache_methods = {
detach,
beginload,
endload,
NULL
,
NULL,
/* serialize */
dump,
currentversion,
newversion,
...
...
@@ -8329,22 +8329,22 @@ static dns_dbmethods_t cache_methods = {
overmem,
settask,
getoriginnode,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL
,
NULL,
/* transfernode */
NULL,
/* getnsec3parameters */
NULL,
/* findnsec3node */
NULL,
/* setsigningtime */
NULL,
/* getsigningtime */
NULL,
/* resigned */
isdnssec,
getrrsetstats,
NULL
,
NULL
,
NULL
,
NULL
,
NULL,
/* rpz_attach */
NULL,
/* rpz_ready */
NULL,
/* findnodeext */
NULL,
/* findext */
setcachestats,
hashsize,
nodefullname,
NULL
,
NULL,
/* getsize */
setservestalettl,
getservestalettl,
NULL
...
...
lib/dns/sdb.c
View file @
7baa39fc
...
...
@@ -1252,14 +1252,14 @@ static dns_dbmethods_t sdb_methods = {
detach
,
beginload
,
endload
,
NULL
,
NULL
,
/* serialize */
dump
,
currentversion
,
newversion
,
attachversion
,
closeversion
,
NULL
,
NULL
,
NULL
,
/* findnode */
NULL
,
/* find */
findzonecut
,
attachnode
,
detachnode
,
...
...
lib/dns/sdlz.c
View file @
7baa39fc
...
...
@@ -1288,7 +1288,7 @@ static dns_dbmethods_t sdlzdb_methods = {
detach
,
beginload
,
endload
,
NULL
,
NULL
,
/* serialize */
dump
,
currentversion
,
newversion
,
...
...
lib/dns/zone.c
View file @
7baa39fc
...
...
@@ -2101,8 +2101,12 @@ zone_load(dns_zone_t *zone, unsigned int flags, isc_boolean_t locked) {
if (zone->type == dns_zone_master || zone->type == dns_zone_slave) {
result = dns_db_setgluecachestats(db, zone->gluecachestats);
if (result != ISC_R_SUCCESS)
if (result == ISC_R_NOTIMPLEMENTED) {
result = ISC_R_SUCCESS;
}
if (result != ISC_R_SUCCESS) {
goto cleanup;
}
}
if (! dns_db_ispersistent(db)) {
...
...
@@ -14671,8 +14675,9 @@ receive_secure_db(isc_task_t *task, isc_event_t *event) {
goto failure;
result = dns_db_setgluecachestats(db, zone->gluecachestats);
if (result != ISC_R_SUCCESS
)
if (result != ISC_R_SUCCESS
&& result != ISC_R_NOTIMPLEMENTED) {
goto failure;
}
result = dns_db_newversion(db, &version);
if (result != ISC_R_SUCCESS)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment