[master] it's okay if dns_db_setgluecachestats() returns ISC_R_NOTIMPLEMENTED

diff --git a/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c
index d867b582cf5599bd2dc7f2f07f2238d643440349..8d642021b6d299663a2111b1bbfa7da4f3a1e8e3 100644 (file)
--- a/bin/tests/system/dyndb/driver/db.c
+++ b/bin/tests/system/dyndb/driver/db.c
@@ -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. */

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 796bbbc06d44de8bcff9d2edad3633bc50ded439..7b77b13298a4764d198da8ef97ee003d8605813d 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -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);
 }

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index a8ddf9fd5b0a840c5b41bd907a1152d2d8607dbe..7d54e77b1a0541b02df3ce54fa9a8810685814dc 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -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

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 7d36de75ee1b06770e32b5d96d1d15790a93a778..456a54bf9f9ae599fc1d688ddbda51591d26bdec 100644 (file)
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -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,

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index eac31799d28876b7a7088552dcdf31259ca34125..6d0183320caad10c72ea4f9a0250de93bbd1ffca 100644 (file)
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1288,7 +1288,7 @@ static dns_dbmethods_t sdlzdb_methods = {
        detach,
        beginload,
        endload,
-       NULL,
+       NULL,                   /* serialize */
        dump,
        currentversion,
        newversion,

diff --git a/lib/dns/zone.c b/lib/dns/zone.c
index 3395d684882d30de1d1781bf7a89ba8e4c8f5ff9..d0da729750e16eba4d95d6f6c07f1a13bcbd33a5 100644 (file)
--- a/lib/dns/zone.c
+++ b/lib/dns/zone.c
@@ -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)