X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fsearch.c;h=caf1dbee9e0df687492f70de0eca7af1fb1d1be9;hb=86c4dca647a164dd7d24d13194f5a9c1f6414a22;hp=f53584a9e88003fc62232b36f96f3b7a40b2fc80;hpb=da6d9eb0463255782f3fa70c61fd958d94c048cf;p=openldap

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index f53584a9e8..caf1dbee9e 100644
--- a/servers/slapd/search.c
+++ b/servers/slapd/search.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2007 The OpenLDAP Foundation.
+ * Copyright 1998-2008 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -41,8 +41,8 @@ do_search(
 	struct berval base = BER_BVNULL;
 	ber_len_t	siz, off, i;
 
-	Debug( LDAP_DEBUG_TRACE, "do_search\n", 0, 0, 0 );
-
+	Debug( LDAP_DEBUG_TRACE, "%s do_search\n",
+		op->o_log_prefix, 0, 0 );
 	/*
 	 * Parse the search request.  It looks like this:
 	 *
@@ -112,8 +112,8 @@ do_search(
 
 	rs->sr_err = dnPrettyNormal( NULL, &base, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
 	if( rs->sr_err != LDAP_SUCCESS ) {
-		Debug( LDAP_DEBUG_ANY,
-			"do_search: invalid dn (%s)\n", base.bv_val, 0, 0 );
+		Debug( LDAP_DEBUG_ANY, "%s do_search: invalid dn (%s)\n",
+			op->o_log_prefix, base.bv_val, 0 );
 		send_ldap_error( op, rs, LDAP_INVALID_DN_SYNTAX, "invalid DN" );
 		goto return_results;
 	}
@@ -163,8 +163,8 @@ do_search(
 	}
 
 	if( get_ctrls( op, rs, 1 ) != LDAP_SUCCESS ) {
-		Debug( LDAP_DEBUG_ANY, "do_search: get_ctrls failed\n", 0, 0, 0 );
-
+		Debug( LDAP_DEBUG_ANY, "%s do_search: get_ctrls failed\n",
+			op->o_log_prefix, 0, 0 );
 		goto return_results;
 	}
 
@@ -239,12 +239,8 @@ return_results:;
 int
 fe_op_search( Operation *op, SlapReply *rs )
 {
-	int			manageDSAit;
-	int			be_manageDSAit;
 	BackendDB		*bd = op->o_bd;
 
-	manageDSAit = get_manageDSAit( op );
-
 	/* fake while loop to allow breaking out */
 	while ( op->ors_scope == LDAP_SCOPE_BASE ) {
 		Entry *entry = NULL;
@@ -320,9 +316,7 @@ fe_op_search( Operation *op, SlapReply *rs )
 	 * if we don't hold it.
 	 */
 
-	be_manageDSAit = manageDSAit;
-
-	op->o_bd = select_backend( &op->o_req_ndn, be_manageDSAit, 1 );
+	op->o_bd = select_backend( &op->o_req_ndn, 1 );
 	if ( op->o_bd == NULL ) {
 		rs->sr_ref = referral_rewrite( default_referral,
 			NULL, &op->o_req_dn, op->ors_scope );