- rename unset_entry_id to unset_entry

- rename check_aci to check_access

1 files changed, 12 insertions, 13 deletions

diff --git a/src/back-sch.c b/src/back-sch.c
index c88bcc1..a5dab35 100644
--- a/src/back-sch.c
+++ b/src/back-sch.c
@@ -59,7 +59,7 @@ struct backend_set_data {
 	Slapi_DN *container_sdn;
 	char *rdn_format;
 	char **attribute_format;
-	bool_t check_aci;
+	bool_t check_access;
 };
 struct backend_entry_data {
 	Slapi_Entry *e;
@@ -125,7 +125,7 @@ backend_copy_set_config(const struct backend_set_data *data)
 	ret->container_sdn = slapi_sdn_dup(data->container_sdn);
 	ret->rdn_format = strdup(data->rdn_format);
 	ret->attribute_format = backend_shr_dup_strlist(data->attribute_format);
-	ret->check_aci = data->check_aci;
+	ret->check_access = data->check_access;
 	if ((ret->common.group == NULL) ||
 	    (ret->common.set == NULL) ||
 	    (ret->common.bases == NULL) ||
@@ -145,7 +145,7 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 			       bool_t *flag, struct backend_shr_set_data **pret)
 {
 	char **bases, *entry_filter, **attributes, *rdn_format, *dn;
-	bool_t check_aci;
+	bool_t check_access;
 	char *actual_attr;
 	const char *cvalue;
 	int i, j, disposition, buffer_flags, count;
@@ -210,7 +210,7 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 		}
 		slapi_vattr_values_free(&values, &actual_attr, buffer_flags);
 	}
-	check_aci = TRUE;
+	check_access = TRUE;
 	if (slapi_vattr_values_get(e, SCH_CONTAINER_CONFIGURATION_ACCESS_ATTR,
 				   &values,
 				   &disposition, &actual_attr,
@@ -222,9 +222,9 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 			if ((strcasecmp(cvalue, "yes") == 0) ||
 			    (strcasecmp(cvalue, "on") == 0) ||
 			    (strcasecmp(cvalue, "1") == 0)) {
-				check_aci = TRUE;
+				check_access = TRUE;
 			} else {
-				check_aci = FALSE;
+				check_access = FALSE;
 			}
 		}
 		slapi_vattr_values_free(&values, &actual_attr, buffer_flags);
@@ -260,7 +260,7 @@ backend_set_config_read_config(struct plugin_state *state, Slapi_Entry *e,
 	ret.container_sdn = slapi_sdn_new_dn_passin(dn);
 	ret.rdn_format = rdn_format;
 	ret.attribute_format = attributes;
-	ret.check_aci = check_aci;
+	ret.check_access = check_access;
 	*pret = backend_copy_set_config(&ret);
 	free(ret.common.group);
 	free(ret.common.set);
@@ -379,9 +379,8 @@ backend_set_entry_one(Slapi_Entry *e, struct backend_set_data *data)
 				"no value for %s, unsetting domain/map/id"
 				"\"%s\"/\"%s\"/(\"%s\")\n",
 				ndn, data->common.group, data->common.set, ndn);
-		map_data_unset_entry_id(data->common.state,
-					data->common.group, data->common.set,
-					ndn);
+		map_data_unset_entry(data->common.state,
+				     data->common.group, data->common.set, ndn);
 		slapi_entry_free(entry);
 	}
 	slapi_ch_free((void **) &ldif);
@@ -642,7 +641,7 @@ struct backend_search_cbdata {
 	struct plugin_state *state;
 	char *target, *strfilter, **attrs;
 	int scope, sizelimit, timelimit, attrsonly;
-	bool_t check_aci;
+	bool_t check_access;
 	Slapi_DN *target_dn;
 	Slapi_Filter *filter;
 
@@ -674,7 +673,7 @@ backend_search_set_cb(const char *domain, const char *map, bool_t secure,
 	}
 	/* Filter check. */
 	result = slapi_filter_test(cbdata->pb, entry_data->e,
-				   cbdata->filter, cbdata->check_aci);
+				   cbdata->filter, cbdata->check_access);
 	if (result == -1) {
 		/* No match. Return. */
 		return TRUE;
@@ -710,7 +709,7 @@ backend_search_set(const char *group, const char *set, bool_t flag,
 	struct backend_set_data *set_data;
 	cbdata = cb_data;
 	set_data = backend_data;
-	cbdata->check_aci = set_data->check_aci;
+	cbdata->check_access = set_data->check_access;
 	/* First, do a scope test on this set. */
 	switch (cbdata->scope) {
 	case LDAP_SCOPE_BASE: