Remove deprecated dns_db_rpz_*() methods
As well as the function wrappers, their slots have been removed from the dns_dbmethods table.
This commit is contained in:
@@ -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 */
|
||||
|
||||
@@ -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
|
||||
*/
|
||||
|
||||
@@ -965,8 +965,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 */
|
||||
|
||||
@@ -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);
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -8223,8 +8223,6 @@ static dns_dbmethods_t zone_methods = { attach,
|
||||
resigned,
|
||||
isdnssec,
|
||||
NULL, /* getrrsetstats */
|
||||
NULL, /* rpz_attach */
|
||||
NULL, /* rpz_ready */
|
||||
NULL, /* findnodeext */
|
||||
NULL, /* findext */
|
||||
NULL, /* setcachestats */
|
||||
@@ -8273,8 +8271,6 @@ static dns_dbmethods_t cache_methods = { attach,
|
||||
NULL, /* resigned */
|
||||
isdnssec,
|
||||
getrrsetstats,
|
||||
NULL, /* rpz_attach */
|
||||
NULL, /* rpz_ready */
|
||||
NULL, /* findnodeext */
|
||||
NULL, /* findext */
|
||||
setcachestats,
|
||||
|
||||
@@ -1288,8 +1288,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 */
|
||||
|
||||
@@ -1246,8 +1246,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 */
|
||||
|
||||
Reference in New Issue
Block a user