From 474c2171ca8f9443c80564cbd0e13c89e4522a82 Mon Sep 17 00:00:00 2001
From: Thomas Woerner <twoerner@redhat.com>
Date: May 25 2020 06:41:39 +0000
Subject: bind-9.16: cfg_parse_buffer changes


cfg_parse_buffer2 has been renamed to cfg_parse_buffer and
cfg_parse_buffer has two addtional parameters.

---

diff --git a/src/bindcfg.c b/src/bindcfg.c
index 5539dea..7844774 100644
--- a/src/bindcfg.c
+++ b/src/bindcfg.c
@@ -108,7 +108,7 @@ cfg_parse_strbuf(cfg_parser_t *parser, const char *string, cfg_type_t **type,
 	isc_buffer_init(&buffer, (char *)string, string_len);
 	isc_buffer_add(&buffer, string_len);
 
-	result = cfg_parse_buffer(parser, &buffer, *type, &ret);
+	result = cfg_parse_buffer(parser, &buffer, NULL, 0, *type, 0, &ret);
 
 	if (result == ISC_R_SUCCESS)
 		*objp = ret;
diff --git a/src/fwd.c b/src/fwd.c
index 7ac381b..6c715d4 100644
--- a/src/fwd.c
+++ b/src/fwd.c
@@ -182,8 +182,8 @@ fwd_print_list_buff(isc_mem_t *mctx, dns_forwarders_t *fwdrs,
 	list_len = fwd_list_len(fwdrs);
 	CHECK(fwd_list_gen_dummy_config_string(mctx,
 					       list_len, &dummy_fwdr_buf));
-	CHECK(cfg_parse_buffer(parser, dummy_fwdr_buf,
-			       cfg_type_forwarders, &forwarders_cfg));
+	CHECK(cfg_parse_buffer(parser, dummy_fwdr_buf, NULL, 0,
+			       cfg_type_forwarders, 0, &forwarders_cfg));
 
 	/* Walk through internal representation and cfg representation and copy
 	 * data from the internal one to cfg data structures.*/
diff --git a/src/settings.c b/src/settings.c
index 90c7e47..18eea14 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -686,8 +686,8 @@ setting_set_parse_conf(isc_mem_t *mctx, const char *name,
 	isc_buffer_add(&in_buf, len);
 
 	CHECK(cfg_parser_create(mctx, dns_lctx, &parser));
-	result = cfg_parse_buffer2(parser, &in_buf, name, cfg_type_conf,
-				   &config);
+	result = cfg_parse_buffer(parser, &in_buf, name, 0, cfg_type_conf, 0,
+				  &config);
 	if (result == ISC_R_SUCCESS) {
 		cfg_printx(config, CFG_PRINTER_XKEY, cfg_printer, log_buf);
 		cfg_obj_log(config, dns_lctx, ISC_LOG_DEBUG(10),