From: Evan Hunt <each@isc.org>
Date: Mon, 22 Jan 2018 21:18:50 +0000 (-0800)
Subject: [master] fix test failure by sorting "type" to the top of zone clauses
X-Git-Tag: v9.13.0~234
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=ebdeea564cb99c2322bd055d1244946e01a8f175;p=thirdparty%2Fbind9.git

[master] fix test failure by sorting "type" to the top of zone clauses
---

diff --git a/lib/isccfg/namedconf.c b/lib/isccfg/namedconf.c
index a8028b9df14..8ccbd0e4f19 100644
--- a/lib/isccfg/namedconf.c
+++ b/lib/isccfg/namedconf.c
@@ -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
 	},