Check that the search base is serviced by a real backend before we'll attempt to participate in a search request.

2 files changed, 11 insertions, 0 deletions

diff --git a/NEWS b/NEWS
index 6b122e2..8dac9bf 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+0.18    * Check that the search base is serviced by a real backend before
+	  we'll attempt to participate in a search request.
 0.17    * Actually send portmap registrations to the right address.
 0.16    * Fix NIS server startup problem when no listening port is explicitly
 	  configured and we're using portmap instead of rpcbind (#500903).
diff --git a/src/back-sch.c b/src/back-sch.c
index eba778a..6fc9c30 100644
--- a/src/back-sch.c
+++ b/src/back-sch.c
@@ -893,6 +893,15 @@ backend_search_cb(Slapi_PBlock *pb)
 			"searching from \"%s\" for \"%s\" with scope %d\n",
 			cbdata.target, cbdata.strfilter, cbdata.scope);
 	cbdata.target_dn = slapi_sdn_new_dn_byval(cbdata.target);
+	/* Check if there's a backend handling this search. */
+	if (!slapi_be_exist(cbdata.target_dn)) {
+		slapi_log_error(SLAPI_LOG_PLUGIN,
+				cbdata.state->plugin_desc->spd_id,
+				"slapi_be_exists(\"%s\") = 0, ignoring search\n",
+				cbdata.target);
+		slapi_sdn_free(&cbdata.target_dn);
+		return 0;
+	}
 	/* Walk the list of groups. */
 	wrap_inc_call_level();
 	map_rdlock();