Commit ebdeea56 authored by Evan Hunt's avatar Evan Hunt
Browse files

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

parent 0405014c
...@@ -2221,6 +2221,11 @@ zone_only_clauses[] = { ...@@ -2221,6 +2221,11 @@ zone_only_clauses[] = {
* Note that the format of the check-names option is different between * Note that the format of the check-names option is different between
* the zone options and the global/view options. Ugh. * 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, { "check-names", &cfg_type_checkmode,
CFG_ZONE_MASTER | CFG_ZONE_SLAVE | CFG_ZONE_MASTER | CFG_ZONE_SLAVE |
CFG_ZONE_HINT | CFG_ZONE_STUB CFG_ZONE_HINT | CFG_ZONE_STUB
...@@ -2265,11 +2270,6 @@ zone_only_clauses[] = { ...@@ -2265,11 +2270,6 @@ zone_only_clauses[] = {
{ "server-names", &cfg_type_namelist, { "server-names", &cfg_type_namelist,
CFG_ZONE_STATICSTUB 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, { "update-policy", &cfg_type_updatepolicy,
CFG_ZONE_MASTER CFG_ZONE_MASTER
}, },
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment