From b143341234f54b8dc3879b6d6c875a4fa470b2c5 Mon Sep 17 00:00:00 2001 From: Nalin Dahyabhai Date: Tue, 23 Nov 2010 14:26:49 -0500 Subject: - for containers which are also the groups, don't return the container entry as a search result if it's also the group entry (in which case we already looked at the entry) --- src/back-sch.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/back-sch.c') diff --git a/src/back-sch.c b/src/back-sch.c index 196fd19..f6e4f31 100644 --- a/src/back-sch.c +++ b/src/back-sch.c @@ -755,9 +755,11 @@ backend_search_set_cb(const char *group, const char *set, bool_t flag, set_data = backend_data; cbdata->check_access = set_data->check_access; - /* Check the set itself. */ - if (slapi_sdn_scope_test(set_data->container_sdn, - cbdata->target_dn, cbdata->scope)) { + /* Check the set itself, unless it's also the group, in which case we + * already evaluated it for this search. */ + if ((strlen(set_data->common.set) != 0) && + (slapi_sdn_scope_test(set_data->container_sdn, + cbdata->target_dn, cbdata->scope))) { set_entry = slapi_entry_alloc(); slapi_entry_add_string(set_entry, "objectClass", "extensibleObject"); -- cgit