ComputerSurge/bind9
3
0
Fork 0
Code Pull Requests 1 Activity

Fix parsing of NZFs saved by rndc addzone with view specified (#39845)

Browse Source
This commit is contained in:
Mukund Sivaraman
2015-06-23 14:19:48 +05:30
parent 2a815e41d2
commit 0439bfedd9
4 changed files with 24 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/isccfg/namedconf.c
View File

@@ -1731,24 +1731,6 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_bindkeys = {
&cfg_rep_map, bindkeys_clausesets
};
/*% The new-zone-file syntax (for zones added by 'rndc addzone') */
static cfg_clausedef_t
newzones_clauses[] = {
{ "zone", &cfg_type_zone, CFG_CLAUSEFLAG_MULTI },
{ NULL, NULL, 0 }
};
static cfg_clausedef_t *
newzones_clausesets[] = {
newzones_clauses,
NULL
};
LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_newzones = {
"newzones", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody,
&cfg_rep_map, newzones_clausesets
};
/*% The "options" statement syntax. */
static cfg_clausedef_t *
@@ -1956,6 +1938,13 @@ LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_addzoneconf = {
&cfg_rep_map, addzoneconf_clausesets
};
/*
* XXXMPA Remove in 9.11. Backwards API compat only.
*/
LIBISCCFG_EXTERNAL_DATA cfg_type_t cfg_type_newzones = {
"newzones", cfg_parse_mapbody, cfg_print_mapbody, cfg_doc_mapbody,
&cfg_rep_map, addzoneconf_clausesets
};
static isc_result_t
parse_unitstring(char *str, isc_resourcevalue_t *valuep) {