From: Alessio Podda <alessio@isc.org>
Date: Thu, 19 Mar 2026 16:44:47 +0000 (+0100)
Subject: fixup! fixup! Duplicate cfg_map
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be44510d0e4ecf8e1dc384c5f735a8ece7e6a502;p=thirdparty%2Fbind9.git

fixup! fixup! Duplicate cfg_map
---

diff --git a/lib/isccfg/include/isccfg/grammar.h b/lib/isccfg/include/isccfg/grammar.h
index 98c7aaad419..2ba4358e313 100644
--- a/lib/isccfg/include/isccfg/grammar.h
+++ b/lib/isccfg/include/isccfg/grammar.h
@@ -91,8 +91,9 @@ typedef struct cfg_clausedef	 cfg_clausedef_t;
 typedef struct cfg_tuplefielddef cfg_tuplefielddef_t;
 typedef struct cfg_printer	 cfg_printer_t;
 typedef ISC_LIST(cfg_listelt_t) cfg_list_t;
-typedef struct cfg_map cfg_map_t;
-typedef struct cfg_rep cfg_rep_t;
+typedef struct cfg_map	        cfg_map_t;
+typedef struct cfg_map_external cfg_map_external_t;
+typedef struct cfg_rep		cfg_rep_t;
 
 /*
  * Function types for configuration object methods
@@ -176,6 +177,15 @@ struct cfg_map {
 	isc_symtab_t *symtab;
 };
 
+struct cfg_map_external {
+	cfg_obj_t *id; /*%< Used for 'named maps' like
+			* keys, zones, &c */
+	const cfg_clausedef_t *const *clausesets; /*%< The clauses that
+						   * can occur in this map;
+						   * used for printing */
+	isc_symtab_t *symtab;
+};
+
 typedef struct cfg_netprefix cfg_netprefix_t;
 
 struct cfg_netprefix {
@@ -229,8 +239,8 @@ struct cfg_obj {
 		uint64_t	   uint64;
 		char		  *string; /*%< null terminated */
 		bool		   boolean;
-		cfg_map_t	  *map;
-		cfg_map_t	  *map_external;
+		cfg_map_t	    *map;
+		cfg_map_external_t  *map_external;
 		cfg_list_t	  *list;
 		cfg_obj_t	 **tuple;
 		isc_sockaddr_t	  *sockaddr;
diff --git a/lib/isccfg/parser.c b/lib/isccfg/parser.c
index be7e3365028..524ee1f319f 100644
--- a/lib/isccfg/parser.c
+++ b/lib/isccfg/parser.c
@@ -3360,7 +3360,7 @@ isc_result_t
 cfg_map_external_get(const cfg_obj_t *mapobj, const char *name,
 		     const cfg_obj_t **obj) {
 	isc_symvalue_t val;
-	const cfg_map_t *map;
+	const cfg_map_external_t *map;
 
 	REQUIRE(mapobj != NULL && mapobj->type->rep == &cfg_rep_map_external);
 	REQUIRE(name != NULL);
@@ -3382,7 +3382,7 @@ cfg_map_external_getname(const cfg_obj_t *mapobj) {
 
 unsigned int
 cfg_map_external_count(const cfg_obj_t *mapobj) {
-	const cfg_map_t *map;
+	const cfg_map_external_t *map;
 
 	REQUIRE(VALID_CFGOBJ(mapobj));
 	REQUIRE(mapobj->type->rep == &cfg_rep_map_external);
@@ -4634,7 +4634,7 @@ static isc_result_t
 map_define_external(cfg_obj_t *mapobj, cfg_obj_t *obj,
 		    const cfg_clausedef_t *clause) {
 	isc_result_t result;
-	const cfg_map_t *map;
+	const cfg_map_external_t *map;
 	isc_symvalue_t symval;
 
 	map = mapobj->value.map_external;