]> git.ipfire.org Git - thirdparty/bind9.git/commitdiff
[v9_11] fix test failure by sorting "type" to the top of zone clauses
authorEvan Hunt <each@isc.org>
Mon, 22 Jan 2018 21:19:19 +0000 (13:19 -0800)
committerEvan Hunt <each@isc.org>
Mon, 22 Jan 2018 21:19:19 +0000 (13:19 -0800)
lib/isccfg/namedconf.c

index 9dbe904c9e70321f681fe6b0fe88bd592cda04b5..98f4accb7ac51fe0eb950e4e181cfe4117f389f4 100644 (file)
@@ -2066,6 +2066,11 @@ zone_only_clauses[] = {
         * Note that the format of the check-names option is different between
         * the zone options and the global/view options.  Ugh.
         */
+       { "type", &cfg_type_zonetype,
+               CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_STUB |
+               CFG_ZONE_STATICSTUB | CFG_ZONE_DELEGATION | CFG_ZONE_HINT |
+               CFG_ZONE_REDIRECT | CFG_ZONE_FORWARD
+       },
        { "check-names", &cfg_type_checkmode,
                CFG_ZONE_MASTER | CFG_ZONE_SLAVE |
                CFG_ZONE_HINT | CFG_ZONE_STUB
@@ -2110,11 +2115,6 @@ zone_only_clauses[] = {
        { "server-names", &cfg_type_namelist,
                CFG_ZONE_STATICSTUB
        },
-       { "type", &cfg_type_zonetype,
-               CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_STUB |
-               CFG_ZONE_STATICSTUB | CFG_ZONE_DELEGATION | CFG_ZONE_HINT |
-               CFG_ZONE_REDIRECT | CFG_ZONE_FORWARD
-       },
        { "update-policy", &cfg_type_updatepolicy,
                CFG_ZONE_MASTER
        },