Clean up CFG_ZONE_DELEGATION

"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.

diff --git a/lib/isccfg/check.c b/lib/isccfg/check.c
index a3c79085da3eea85c5e7b6a6774ad1596b0b37b9..1e82acf9d311dcbb1189654f817f9d86c9bed3e1 100644 (file)
--- a/lib/isccfg/check.c
+++ b/lib/isccfg/check.c
@@ -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:

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 28dfa3e136eab890430472fa68486487395ef5b7..6c3c1cb39b5d3411c30a7cd7a8be970f656e8488 100644 (file)
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -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;

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index d5c61b2402ba46bed8b6f98f4daa53ee4eace1e7..67824c75e80dc1401e2da2cc4ef002c661236dc9 100644 (file)
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -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 }
 };