summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/back-nis.c13
-rw-r--r--src/back-sch.c25
-rw-r--r--src/back-shr.c18
-rw-r--r--src/map.c8
-rw-r--r--src/map.h6
5 files changed, 34 insertions, 36 deletions
diff --git a/src/back-nis.c b/src/back-nis.c
index 7d34079..0435d53 100644
--- a/src/back-nis.c
+++ b/src/back-nis.c
@@ -174,10 +174,10 @@ backend_set_entry_one(Slapi_Entry *e, struct backend_set_data *data)
data->key_formats[i],
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);
for (k = 0; k < j; k++) {
format_free_data(keys[k]);
}
@@ -271,9 +271,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);
}
format_free_data(value);
free(all_keys);
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:
diff --git a/src/back-shr.c b/src/back-shr.c
index 3fb491a..f18b76e 100644
--- a/src/back-shr.c
+++ b/src/back-shr.c
@@ -806,10 +806,10 @@ backend_shr_modify_entry_cb(const char *group, const char *set, bool_t flag,
set_data->group,
set_data->set,
cbdata->ndn);
- map_data_unset_entry_id(cbdata->state,
- set_data->group,
- set_data->set,
- cbdata->ndn);
+ map_data_unset_entry(cbdata->state,
+ set_data->group,
+ set_data->set,
+ cbdata->ndn);
}
/* If the entry now matches the map, add it (or re-add it). */
if (backend_shr_entry_matches_set(set_data, cbdata->pb,
@@ -926,10 +926,10 @@ backend_shr_modrdn_entry_cb(const char *group, const char *set, bool_t secure,
set_data->group,
set_data->set,
cbdata->ndn_pre);
- map_data_unset_entry_id(cbdata->state,
- set_data->group,
- set_data->set,
- cbdata->ndn_pre);
+ map_data_unset_entry(cbdata->state,
+ set_data->group,
+ set_data->set,
+ cbdata->ndn_pre);
}
/* Set the entry in the map which corresponds to this entry, or clear
* any that might if this entry doesn't have a key and value. */
@@ -1024,7 +1024,7 @@ backend_shr_delete_entry_cb(const char *group, const char *set, bool_t flag,
"\"%s\"/\"%s\"=\"%s\"/\"%s\"/(\"%s\")\n",
group, set, set_data->group, set_data->set,
cbdata->ndn);
- map_data_unset_entry_id(cbdata->state, group, set, cbdata->ndn);
+ map_data_unset_entry(cbdata->state, group, set, cbdata->ndn);
}
return TRUE;
}
diff --git a/src/map.c b/src/map.c
index 4a4b7a8..e083ffc 100644
--- a/src/map.c
+++ b/src/map.c
@@ -852,10 +852,10 @@ map_data_unset_map_entry(struct plugin_state *state,
/* Remove the entry from the map which matches the passed-in ID. */
void
-map_data_unset_entry_id(struct plugin_state *state,
- const char *domain_name,
- const char *map_name,
- const char *id)
+map_data_unset_entry(struct plugin_state *state,
+ const char *domain_name,
+ const char *map_name,
+ const char *id)
{
struct map *map;
struct map_entry *entry;
diff --git a/src/map.h b/src/map.h
index 3230df3..81b65f8 100644
--- a/src/map.h
+++ b/src/map.h
@@ -73,9 +73,9 @@ void map_data_set_map(struct plugin_state *state,
const char *domain_name, const char *map_name,
bool_t secure,
void *backend_data, void (*free_backend_data)(void *p));
-void map_data_unset_entry_id(struct plugin_state *state,
- const char *domain_name, const char *map_name,
- const char *id);
+void map_data_unset_entry(struct plugin_state *state,
+ const char *domain_name, const char *map_name,
+ const char *id);
void map_data_set_entry(struct plugin_state *state,
const char *domain_name, const char *map_name,
const char *id,
generated by cgit (git 2.34.1) at 2024-06-23 01:09:11 +0000