upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-06-05 12:22:04 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'fanf-rbt64-gone' into 'main'

Browse source 
Remove remaining checks for rbt64

See merge request isc-projects/bind9!6218
This commit is contained in:
Mark Andrews 2022-05-03 01:57:26 +00:00
commit f432a2b148
5 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
bin/check/named-checkconf.c
View file

@ -246,9 +246,7 @@ configure_zone(const char *vclass, const char *view, const cfg_obj_t *zconfig,
* Skip checks when using an alternate data source.
*/
cfg_map_get(zoptions, "database", &dbobj);
if (dbobj != NULL && strcmp("rbt", cfg_obj_asstring(dbobj)) != 0 &&
strcmp("rbt64", cfg_obj_asstring(dbobj)) != 0)
{
if (dbobj != NULL && strcmp("rbt", cfg_obj_asstring(dbobj)) != 0) {
return (ISC_R_SUCCESS);
}

4
bin/named/server.c
View file

@ -1779,10 +1779,6 @@ check_dbtype(dns_zone_t *zone, unsigned int dbtypec, const char **dbargv,
for (i = 0; i < dbtypec; i++) {
if (argv[i] == NULL || strcmp(argv[i], dbargv[i]) != 0) {
CHECK(ISC_R_FAILURE);
/*
* Check that there are not extra arguments.
*/
}
}

5
lib/bind9/check.c
View file

@ -3738,7 +3738,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
}
/*
* If the zone type is rbt/rbt64 then primary/hint zones require file
* If the zone type is rbt then primary/hint zones require file
* clauses. If inline-signing is used, then secondary zones require a
* file clause as well.
*/
@ -3759,8 +3759,7 @@ check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
result = ISC_R_FAILURE;
} else if (!dlz && (tresult == ISC_R_NOTFOUND ||
(tresult == ISC_R_SUCCESS &&
(strcmp("rbt", cfg_obj_asstring(obj)) == 0 ||
strcmp("rbt64", cfg_obj_asstring(obj)) == 0))))
strcmp("rbt", cfg_obj_asstring(obj)) == 0)))
{
isc_result_t res1;
const cfg_obj_t *fileobj = NULL;

4
lib/dns/rbtdb.h
View file

@ -34,8 +34,8 @@ dns_rbtdb_create(isc_mem_t *mctx, const dns_name_t *base, dns_dbtype_t type,
void *driverarg, dns_db_t **dbp);
/*%<
* Create a new database of type "rbt" (or "rbt64"). Called via
* dns_db_create(); see documentation for that function for more details.
* Create a new database of type "rbt". Called via dns_db_create();
* see documentation for that function for more details.
*
* If argv[0] is set, it points to a valid memory context to be used for
* allocation of heap memory. Generally this is used for cache databases

7
lib/dns/zone.c
View file

@ -1924,9 +1924,7 @@ dns_zone_rpz_enable(dns_zone_t *zone, dns_rpz_zones_t *rpzs,
* Only zones that are loaded instead of mmap()ed create the
* summary data and so can be policy zones.
*/
if (strcmp(zone->db_argv[0], "rbt") != 0 &&
strcmp(zone->db_argv[0], "rbt64") != 0)
{
if (strcmp(zone->db_argv[0], "rbt") != 0) {
return (ISC_R_NOTIMPLEMENTED);
}
@ -2163,8 +2161,7 @@ zone_load(dns_zone_t *zone, unsigned int flags, bool locked) {
INSIST(zone->db_argc >= 1);
rbt = strcmp(zone->db_argv[0], "rbt") == 0 ||
strcmp(zone->db_argv[0], "rbt64") == 0;
rbt = strcmp(zone->db_argv[0], "rbt") == 0;
if (zone->db != NULL && zone->masterfile == NULL && rbt) {
/*