- make sense of matching results

1 files changed, 17 insertions, 5 deletions

diff --git a/src/back-sch.c b/src/back-sch.c
index 26a5952..ef49069 100644
--- a/src/back-sch.c
+++ b/src/back-sch.c
@@ -663,17 +663,29 @@ backend_search_set_cb(const char *domain, const char *map, bool_t secure,
 	cbdata = cb_data;
 	entry_data = backend_data;
 	sdn = slapi_entry_get_sdn(entry_data->e);
-	if (slapi_sdn_scope_test(sdn, cbdata->target_dn, cbdata->scope) != 0) {
+	/* Scope check. */
+	if (slapi_sdn_scope_test(sdn, cbdata->target_dn, cbdata->scope) == 0) {
+		/* Fail. Return. */
 		return TRUE;
 	}
+	/* Filter check. */
 	result = slapi_filter_test(cbdata->pb, entry_data->e,
 				   cbdata->filter, cbdata->check_aci);
-	if (result == 0) {
+	if (result == -1) {
+		/* Fail. Return. */
+		return TRUE;
+	}
+	if (result != 0) {
 		slapi_log_error(SLAPI_LOG_PLUGIN,
 				cbdata->state->plugin_desc->spd_id,
-				"search matches %s\n",
-				slapi_sdn_get_ndn(sdn));
+				"search got error %d checking %s\n",
+				result, slapi_sdn_get_ndn(sdn));
+		return TRUE;
 	}
+	slapi_log_error(SLAPI_LOG_PLUGIN,
+			cbdata->state->plugin_desc->spd_id,
+			"search matched %s\n",
+			slapi_sdn_get_ndn(sdn));
 	return TRUE;
 }
 static bool_t
@@ -722,7 +734,7 @@ backend_search_set(const char *group, const char *set, bool_t flag,
 		break;
 	}
 	slapi_log_error(SLAPI_LOG_PLUGIN, cbdata->state->plugin_desc->spd_id,
-			"scope test succeeds for %s, searching set\n",
+			"scope test succeeds for %s, searching its set\n",
 			slapi_sdn_get_ndn(set_data->container_sdn));
 	map_data_foreach_entry_id(cbdata->state, group, set, NULL,
 				  backend_search_set_cb, cbdata);