Remove deprecated dns_db_rpz_*() methods

As well as the function wrappers, their slots have been removed from
the dns_dbmethods table.

diff --git a/bin/tests/system/dyndb/driver/db.c b/bin/tests/system/dyndb/driver/db.c
index f7b052fbba7fadc2f6575c12cceb3de3783ec96a..54c6a808e01ae5cb5632e64c46a12d99cc4129e2 100644 (file)
--- a/bin/tests/system/dyndb/driver/db.c
+++ b/bin/tests/system/dyndb/driver/db.c
@@ -575,8 +575,6 @@ static dns_dbmethods_t sampledb_methods = {
        getoriginnode,  transfernode,   getnsec3parameters,
        findnsec3node,  setsigningtime, getsigningtime,
        resigned,       isdnssec,       getrrsetstats,
-       NULL, /* rpz_attach */
-       NULL, /* rpz_ready */
        findnodeext,    findext,        setcachestats,
        hashsize,       NULL, /* nodefullname */
        NULL,                 /* getsize */

diff --git a/lib/dns/db.c b/lib/dns/db.c
index 87549bbcb45c3b89c82faaf2aa01e06332f16581..0a10c39418caf249ca7f2e973002c93fa99fb3b9 100644 (file)
--- a/lib/dns/db.c
+++ b/lib/dns/db.c
@@ -975,28 +975,6 @@ dns_db_resigned(dns_db_t *db, dns_rdataset_t *rdataset,
        }
 }
 
-/*
- * Attach a database to policy zone databases.
- * This should only happen when the caller has already ensured that
- * it is dealing with a database that understands response policy zones.
- */
-void
-dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) {
-       REQUIRE(db->methods->rpz_attach != NULL);
-       (db->methods->rpz_attach)(db, rpzs, rpz_num);
-}
-
-/*
- * Finish loading a response policy zone.
- */
-isc_result_t
-dns_db_rpz_ready(dns_db_t *db) {
-       if (db->methods->rpz_ready == NULL) {
-               return (ISC_R_SUCCESS);
-       }
-       return ((db->methods->rpz_ready)(db));
-}
-
 /*
  * Attach a notify-on-update function the database
  */

diff --git a/lib/dns/dnsrps.c b/lib/dns/dnsrps.c
index a78c8f2013ddd3162ce5c41e8fe701fc89f97288..341c116f233b56966f8815dbd40aacf7de1d9e3f 100644 (file)
--- a/lib/dns/dnsrps.c
+++ b/lib/dns/dnsrps.c
@@ -967,8 +967,6 @@ static dns_dbmethods_t rpsdb_db_methods = {
        NULL, /* resigned */
        NULL, /* isdnssec */
        NULL, /* getrrsetstats */
-       NULL, /* rpz_attach */
-       NULL, /* rpz_ready */
        NULL, /* findnodeext */
        NULL, /* findext */
        NULL, /* setcachestats */

diff --git a/lib/dns/include/dns/db.h b/lib/dns/include/dns/db.h
index b15279c9eef34b554d84830f816bc4814453dd63..e48833fe399e8b7680ab187468e8032ecda25ea2 100644 (file)
--- a/lib/dns/include/dns/db.h
+++ b/lib/dns/include/dns/db.h
@@ -50,7 +50,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <isc/deprecated.h>
 #include <isc/lang.h>
 #include <isc/magic.h>
 #include <isc/stats.h>
@@ -159,8 +158,6 @@ typedef struct dns_dbmethods {
                         dns_dbversion_t *version);
        bool (*isdnssec)(dns_db_t *db);
        dns_stats_t *(*getrrsetstats)(dns_db_t *db);
-       void (*rpz_attach)(dns_db_t *db, void *rpzs, uint8_t rpz_num);
-       isc_result_t (*rpz_ready)(dns_db_t *db);
        isc_result_t (*findnodeext)(dns_db_t *db, const dns_name_t *name,
                                    bool                     create,
                                    dns_clientinfomethods_t *methods,
@@ -1626,19 +1623,6 @@ dns_db_setcachestats(dns_db_t *db, isc_stats_t *stats);
  *     dns_rdatasetstats_create(); otherwise NULL.
  */
 
-void
-dns_db_rpz_attach(dns_db_t *db, void *rpzs, uint8_t rpz_num) ISC_DEPRECATED;
-/*%<
- * Attach the response policy information for a view to a database for a
- * zone for the view.
- */
-
-isc_result_t
-dns_db_rpz_ready(dns_db_t *db) ISC_DEPRECATED;
-/*%<
- * Finish loading a response policy zone.
- */
-
 isc_result_t
 dns_db_updatenotify_register(dns_db_t *db, dns_dbupdate_callback_t fn,
                             void *fn_arg);

diff --git a/lib/dns/include/dns/rpz.h b/lib/dns/include/dns/rpz.h
index 6ccb0242efd6212957905bd0e8adda26fe2f210e..a11dd1c63afdc55c203d774b08806a9c68a68f44 100644 (file)
--- a/lib/dns/include/dns/rpz.h
+++ b/lib/dns/include/dns/rpz.h
@@ -21,7 +21,6 @@
 #include <inttypes.h>
 #include <stdbool.h>
 
-#include <isc/deprecated.h>
 #include <isc/event.h>
 #include <isc/ht.h>
 #include <isc/lang.h>

diff --git a/lib/dns/rbtdb.c b/lib/dns/rbtdb.c
index a416ab66f7893e77d785fb48eb5fd0ef1d0f2390..73c86615cca67a66a8ac46804b9ee23303c71799 100644 (file)
--- a/lib/dns/rbtdb.c
+++ b/lib/dns/rbtdb.c
@@ -8138,8 +8138,6 @@ static dns_dbmethods_t zone_methods = { attach,
                                        resigned,
                                        isdnssec,
                                        NULL, /* getrrsetstats */
-                                       NULL, /* rpz_attach */
-                                       NULL, /* rpz_ready */
                                        NULL, /* findnodeext */
                                        NULL, /* findext */
                                        NULL, /* setcachestats */
@@ -8188,8 +8186,6 @@ static dns_dbmethods_t cache_methods = { attach,
                                         NULL, /* resigned */
                                         isdnssec,
                                         getrrsetstats,
-                                        NULL, /* rpz_attach */
-                                        NULL, /* rpz_ready */
                                         NULL, /* findnodeext */
                                         NULL, /* findext */
                                         setcachestats,

diff --git a/lib/dns/sdb.c b/lib/dns/sdb.c
index 65701a0647374f0602be82476754efe49784ac0b..c20670eb1fc0a9de061c3078b45193214ec399f7 100644 (file)
--- a/lib/dns/sdb.c
+++ b/lib/dns/sdb.c
@@ -1289,8 +1289,6 @@ static dns_dbmethods_t sdb_methods = {
        NULL,          /* resigned */
        NULL,          /* isdnssec */
        NULL,          /* getrrsetstats */
-       NULL,          /* rpz_attach */
-       NULL,          /* rpz_ready */
        findnodeext,    findext,
        NULL, /* setcachestats */
        NULL, /* hashsize */

diff --git a/lib/dns/sdlz.c b/lib/dns/sdlz.c
index fbe4b6024463bd2e07bbc2830510c38d536d4474..e2e77f2f09a3d031c8c954bc6ff8ee0d3ca2c34e 100644 (file)
--- a/lib/dns/sdlz.c
+++ b/lib/dns/sdlz.c
@@ -1247,8 +1247,6 @@ static dns_dbmethods_t sdlzdb_methods = {
        NULL,                                 /* resigned */
        NULL,                                 /* isdnssec */
        NULL,                                 /* getrrsetstats */
-       NULL,                                 /* rpz_attach */
-       NULL,                                 /* rpz_ready */
        findnodeext,    findext,        NULL, /* setcachestats */
        NULL,                                 /* hashsize */
        NULL,                                 /* nodefullname */