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

index a8028b9df14dd05b524244bab0aa0a49d0e9c476..8ccbd0e4f19424f78910921d8e0f8d52f1b00066 100644 (file)
@@ -2221,6 +2221,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
@@ -2265,11 +2270,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
        },