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

Clean up CFG_ZONE_DELEGATION

Browse source 
"type delegation-only" has been obsolete for some time
(see #3953) but the zone type flag for it was still defined
in libisccfg. It has now been removed.
This commit is contained in:
Evan Hunt 2025-06-04 17:06:25 -07:00
parent 0c7a54095f
commit 1a24dfcddf
3 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/isccfg/check.c
View file

@ -3165,7 +3165,6 @@ isccfg_check_zoneconf(const cfg_obj_t *zconfig, const cfg_obj_t *voptions,
case CFG_ZONE_FORWARD:
case CFG_ZONE_REDIRECT:
case CFG_ZONE_DELEGATION:
break;
case CFG_ZONE_PRIMARY:

5
lib/isccfg/include/isccfg/grammar.h
View file

@ -83,9 +83,8 @@ enum {
CFG_ZONE_FORWARD = 1 << 27,
CFG_ZONE_STATICSTUB = 1 << 26,
CFG_ZONE_REDIRECT = 1 << 25,
CFG_ZONE_DELEGATION = 1 << 24,
CFG_ZONE_INVIEW = 1 << 23,
CFG_ZONE_MIRROR = 1 << 22,
CFG_ZONE_INVIEW = 1 << 24,
CFG_ZONE_MIRROR = 1 << 23,
};
typedef struct cfg_clausedef cfg_clausedef_t;

8
lib/isccfg/namedconf.c
View file

@ -2426,8 +2426,8 @@ static cfg_clausedef_t zone_only_clauses[] = {
*/
{ "type", &cfg_type_zonetype,
CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR |
CFG_ZONE_STUB | CFG_ZONE_STATICSTUB | CFG_ZONE_DELEGATION |
CFG_ZONE_HINT | CFG_ZONE_REDIRECT | CFG_ZONE_FORWARD },
CFG_ZONE_STUB | CFG_ZONE_STATICSTUB | CFG_ZONE_HINT |
CFG_ZONE_REDIRECT | CFG_ZONE_FORWARD },
{ "check-names", &cfg_type_checkmode,
CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR |
CFG_ZONE_HINT | CFG_ZONE_STUB },
@ -2475,8 +2475,8 @@ static cfg_clausedef_t non_template_clauses[] = {
{ "in-view", &cfg_type_astring, CFG_ZONE_INVIEW },
{ "template", &cfg_type_astring,
CFG_ZONE_PRIMARY | CFG_ZONE_SECONDARY | CFG_ZONE_MIRROR |
CFG_ZONE_STUB | CFG_ZONE_STATICSTUB | CFG_ZONE_DELEGATION |
CFG_ZONE_HINT | CFG_ZONE_REDIRECT | CFG_ZONE_FORWARD },
CFG_ZONE_STUB | CFG_ZONE_STATICSTUB | CFG_ZONE_HINT |
CFG_ZONE_REDIRECT | CFG_ZONE_FORWARD },
{ NULL, NULL, 0 }
};