diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/back-nis.c | 2 | ||||
| -rw-r--r-- | src/back-sch.c | 14 | ||||
| -rw-r--r-- | src/back-shr.c | 11 | ||||
| -rw-r--r-- | src/format.c | 2 |
4 files changed, 16 insertions, 13 deletions
diff --git a/src/back-nis.c b/src/back-nis.c index 1d3e946..4b4643b 100644 --- a/src/back-nis.c +++ b/src/back-nis.c @@ -692,7 +692,7 @@ backend_get_set_config(struct plugin_state *state, pb = slapi_pblock_new(); slapi_search_internal_set_pb(pb, state->plugin_base, - LDAP_SCOPE_SUB, + LDAP_SCOPE_SUBTREE, filter, attrs, FALSE, NULL, diff --git a/src/back-sch.c b/src/back-sch.c index 93df40b..b907159 100644 --- a/src/back-sch.c +++ b/src/back-sch.c @@ -444,7 +444,7 @@ backend_get_set_config(struct plugin_state *state, pb = slapi_pblock_new(); slapi_search_internal_set_pb(pb, state->plugin_base, - LDAP_SCOPE_SUB, + LDAP_SCOPE_SUBTREE, filter, attrs, FALSE, NULL, @@ -623,7 +623,7 @@ backend_search_set_cb(const char *group, const char *set, bool_t flag, return TRUE; } break; - case LDAP_SCOPE_ONE: + case LDAP_SCOPE_ONELEVEL: /* If it's not a scope=one search of this set, then we're done * with this set. */ if (slapi_sdn_compare(set_data->container_sdn, @@ -631,7 +631,7 @@ backend_search_set_cb(const char *group, const char *set, bool_t flag, return TRUE; } break; - case LDAP_SCOPE_SUB: + case LDAP_SCOPE_SUBTREE: /* If the search suffix is not a suffix of the set and it's not * the set itself, then we're done with this set. */ if ((slapi_sdn_compare(set_data->container_sdn, @@ -703,7 +703,8 @@ backend_search_group_cb(const char *group, void *cb_data) backend_search_set_cb, cbdata); /* If the search is confined to this group, we need to send the result * ourselves. */ - if (slapi_sdn_scope_test(cbdata->target_dn, group_dn, LDAP_SCOPE_SUB)) { + if (slapi_sdn_scope_test(cbdata->target_dn, group_dn, + LDAP_SCOPE_SUBTREE)) { cbdata->answer = TRUE; } slapi_sdn_free(&group_dn); @@ -771,7 +772,7 @@ backend_locate_cb(const char *group, const char *set, bool_t flag, set_data = backend_set_data; /* Check if the target DN looks like it would be part of this set. */ if (slapi_sdn_scope_test(cbdata->target_dn, set_data->container_sdn, - LDAP_SCOPE_ONE)) { + LDAP_SCOPE_ONELEVEL)) { /* Pull out the RDN and check for an entry which is using the * RDN as a key. */ rdn = slapi_rdn_new_sdn(cbdata->target_dn); @@ -820,7 +821,8 @@ backend_group_check_scope_cb(const char *group, void *cb_data) cbdata = cb_data; group_dn = slapi_sdn_new_dn_byref(group); - if (slapi_sdn_scope_test(cbdata->target_dn, group_dn, LDAP_SCOPE_SUB)) { + if (slapi_sdn_scope_test(cbdata->target_dn, group_dn, + LDAP_SCOPE_SUBTREE)) { cbdata->ours = TRUE; } slapi_sdn_free(&group_dn); diff --git a/src/back-shr.c b/src/back-shr.c index 570d7f9..e21f5ee 100644 --- a/src/back-shr.c +++ b/src/back-shr.c @@ -363,7 +363,7 @@ backend_shr_set_config_entry_add(struct plugin_state *state, Slapi_Entry *e, set_bases[i], set_entry_filter); slapi_search_internal_set_pb(pb, set_bases[i], - LDAP_SCOPE_SUB, + LDAP_SCOPE_SUBTREE, set_entry_filter, NULL, FALSE, NULL, @@ -518,7 +518,7 @@ backend_shr_startup(struct plugin_state *state, const char *filter) state->plugin_base); slapi_search_internal_set_pb(pb, state->plugin_base, - LDAP_SCOPE_ONE, + LDAP_SCOPE_ONELEVEL, filter, NULL, FALSE, NULL, @@ -645,7 +645,7 @@ backend_shr_entry_matches_set(struct backend_shr_set_data *set_data, for (i = 0; set_bases[i] != NULL; i++) { if (backend_shr_entry_matches(pb, e, set_bases[i], - LDAP_SCOPE_SUB, + LDAP_SCOPE_SUBTREE, set_filter)) { return TRUE; } @@ -660,7 +660,8 @@ backend_shr_entry_is_a_set(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e) { return backend_shr_entry_matches(pb, e, - state->plugin_base, LDAP_SCOPE_ONE, + state->plugin_base, + LDAP_SCOPE_ONELEVEL, backend_entry_get_set_config_entry_filter()); } @@ -748,7 +749,7 @@ backend_shr_update_references_cb(const char *group, const char *set, i++) { slapi_search_internal_set_pb(cbdata->pb, set_bases[i], - LDAP_SCOPE_SUB, + LDAP_SCOPE_SUBTREE, filter, NULL, FALSE, NULL, diff --git a/src/format.c b/src/format.c index f249b0b..3df4ab9 100644 --- a/src/format.c +++ b/src/format.c @@ -809,7 +809,7 @@ format_referred(struct plugin_state *state, Slapi_PBlock *pb, Slapi_Entry *e, for (i = 0; (set_bases != NULL) && (set_bases[i] != NULL); i++) { /* Set up the search. */ slapi_search_internal_set_pb(local_pb, - set_bases[i], LDAP_SCOPE_SUB, + set_bases[i], LDAP_SCOPE_SUBTREE, filter, attrs, FALSE, NULL, NULL, state->plugin_identity, 0); |