- be more consisten about group/set nomenclature

4 files changed, 20 insertions, 20 deletions

diff --git a/src/back-nis.c b/src/back-nis.c
index 5597255..8a394f9 100644
--- a/src/back-nis.c
+++ b/src/back-nis.c
@@ -822,25 +822,25 @@ backend_set_config_entry_delete_cb(Slapi_Entry *e, void *callback_data)
 
 /* Read enough of the map configuration for the formatting code to be able to
  * resolver references correctly. */
-struct backend_get_map_config_cb {
+struct backend_get_set_config_cb {
 	struct plugin_state *state;
 	char **bases;
 	char *entry_filter;
 };
 
 void
-backend_free_map_config(char **bases, char *entry_filter)
+backend_free_set_config(char **bases, char *entry_filter)
 {
 	backend_shr_free_strlist(bases);
 	free(entry_filter);
 }
 
 static bool_t
-backend_get_map_config_entry_cb(Slapi_Entry *e, void *callback_data)
+backend_get_set_config_entry_cb(Slapi_Entry *e, void *callback_data)
 {
 	Slapi_ValueSet *values;
 	Slapi_Value *value;
-	struct backend_get_map_config_cb *cbdata;
+	struct backend_get_set_config_cb *cbdata;
 	char *actual_attr;
 	const char *cvalue;
 	int disposition, buffer_flags, i, count;
@@ -886,7 +886,7 @@ backend_get_map_config_entry_cb(Slapi_Entry *e, void *callback_data)
 }
 
 void
-backend_get_map_config(struct plugin_state *state,
+backend_get_set_config(struct plugin_state *state,
 		       const char *domain, const char *map,
 		       char ***bases, char **entry_filter)
 {
@@ -897,7 +897,7 @@ backend_get_map_config(struct plugin_state *state,
 			 NULL};
 	const char *default_filter;
 	bool_t map_secure;
-	struct backend_get_map_config_cb cbdata;
+	struct backend_get_set_config_cb cbdata;
 
 	/* Build the search filter. */
 	filter = malloc(strlen("(&("
@@ -938,7 +938,7 @@ backend_get_map_config(struct plugin_state *state,
 	cbdata.entry_filter = strdup(default_filter);
 	slapi_search_internal_callback_pb(pb, &cbdata,
 					  NULL,
-					  backend_get_map_config_entry_cb,
+					  backend_get_set_config_entry_cb,
 					  NULL);
 
 	/* Return the results. */
diff --git a/src/back-sch.c b/src/back-sch.c
index 604d9ab..ed10afa 100644
--- a/src/back-sch.c
+++ b/src/back-sch.c
@@ -388,25 +388,25 @@ backend_set_config_entry_delete_cb(Slapi_Entry *e, void *callback_data)
 
 /* Functions for passing information about a container's configuration to the
  * formatting functions. */
-struct backend_get_map_config_cb {
+struct backend_get_set_config_cb {
 	struct plugin_state *state;
 	char **bases;
 	char *entry_filter;
 };
 
 void
-backend_free_map_config(char **bases, char *entry_filter)
+backend_free_set_config(char **bases, char *entry_filter)
 {
 	backend_shr_free_strlist(bases);
 	free(entry_filter);
 }
 
 static bool_t
-backend_get_map_config_entry_cb(Slapi_Entry *e, void *callback_data)
+backend_get_set_config_entry_cb(Slapi_Entry *e, void *callback_data)
 {
 	Slapi_ValueSet *values;
 	Slapi_Value *value;
-	struct backend_get_map_config_cb *cbdata;
+	struct backend_get_set_config_cb *cbdata;
 	char *actual_attr;
 	const char *cvalue;
 	int disposition, buffer_flags, i, count;
@@ -454,7 +454,7 @@ backend_get_map_config_entry_cb(Slapi_Entry *e, void *callback_data)
 }
 
 void
-backend_get_map_config(struct plugin_state *state,
+backend_get_set_config(struct plugin_state *state,
 		       const char *group, const char *container,
 		       char ***bases, char **entry_filter)
 {
@@ -464,7 +464,7 @@ backend_get_map_config(struct plugin_state *state,
 			 SCH_CONTAINER_CONFIGURATION_BASE_ATTR,
 			 NULL};
 	const char *default_filter;
-	struct backend_get_map_config_cb cbdata;
+	struct backend_get_set_config_cb cbdata;
 
 	/* Build the search filter. */
 	filter = malloc(strlen("(&("
@@ -501,7 +501,7 @@ backend_get_map_config(struct plugin_state *state,
 	cbdata.entry_filter = NULL;
 	slapi_search_internal_callback_pb(pb, &cbdata,
 					  NULL,
-					  backend_get_map_config_entry_cb,
+					  backend_get_set_config_entry_cb,
 					  NULL);
 
 	/* Return the results. */
diff --git a/src/back-shr.c b/src/back-shr.c
index f6384f9..6af8883 100644
--- a/src/back-shr.c
+++ b/src/back-shr.c
@@ -370,7 +370,7 @@ backend_shr_set_config_entry_delete(struct plugin_state *state,
 	return 0;
 }
 
-struct backend_get_map_config_cb {
+struct backend_get_set_config_cb {
 	struct plugin_state *state;
 	char **bases;
 	char *entry_filter;
@@ -391,7 +391,7 @@ backend_shr_get_set_config_entry_cb(Slapi_Entry *e, void *callback_data,
 {
 	Slapi_ValueSet *values;
 	Slapi_Value *value;
-	struct backend_get_map_config_cb *cbdata;
+	struct backend_get_set_config_cb *cbdata;
 	char *actual_attr;
 	const char *cvalue;
 	int disposition, buffer_flags, i, count;
diff --git a/src/format.c b/src/format.c
index 70e8722..82dac70 100644
--- a/src/format.c
+++ b/src/format.c
@@ -751,7 +751,7 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	/* Retrieve the map-specific paramters. */
 	map_filter = NULL;
 	map_bases = NULL;
-	backend_get_map_config(state, group, argv[1], &map_bases, &map_filter);
+	backend_get_set_config(state, group, argv[1], &map_bases, &map_filter);
 	if (map_filter == NULL) {
 		map_filter = "(objectClass=*)";
 	}
@@ -772,7 +772,7 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 		slapi_log_error(SLAPI_LOG_PLUGIN,
 				state->plugin_desc->spd_id,
 				"referred: out of memory\n");
-		backend_free_map_config(map_bases, map_filter);
+		backend_free_set_config(map_bases, map_filter);
 		slapi_pblock_destroy(local_pb);
 		format_free_parsed_args(argv);
 		return -ENOMEM;
@@ -787,7 +787,7 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 			slapi_log_error(SLAPI_LOG_PLUGIN,
 					state->plugin_desc->spd_id,
 					"referred: out of memory\n");
-			backend_free_map_config(map_bases, map_filter);
+			backend_free_set_config(map_bases, map_filter);
 			slapi_pblock_destroy(local_pb);
 			format_free_parsed_args(argv);
 			return -ENOMEM;
@@ -816,7 +816,7 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e,
 	}
 	free(tndn);
 
-	backend_free_map_config(map_bases, map_filter);
+	backend_free_set_config(map_bases, map_filter);
 	slapi_pblock_destroy(local_pb);
 	format_free_parsed_args(argv);
 	return cbdata.ret ? cbdata.ret : cbdata.outbuf - outbuf;