X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Fsearch.c;h=34197d090b9f921cd8b33dfae5cb49bbc909fe27;hb=0006ec0a46790567d3d49fcafce5ffaae08cdbf4;hp=7645674c15db539ddb39589d2d4460863f767248;hpb=713e6beb8d0ab8e3493f482f16fe4c42ebffe1ee;p=openldap

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index 7645674c15..34197d090b 100644
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -315,22 +315,26 @@ bdb_search(
 			goto loop_continue;
 		}
 
+#ifdef BDB_SUBENTRIES
 		if ( is_entry_subentry( e ) ) {
 			if( scope != LDAP_SCOPE_BASE ) {
 				if(!get_subentries_visibility( op )) {
 					/* only subentries are visible */
 					goto loop_continue;
 				}
+
 			} else if ( get_subentries( op ) &&
 				!get_subentries_visibility( op ))
 			{
 				/* only subentries are visible */
 				goto loop_continue;
 			}
+
 		} else if ( get_subentries_visibility( op )) {
 			/* only subentries are visible */
 			goto loop_continue;
 		}
+#endif
 
 #ifdef BDB_ALIASES
 		if ( deref & LDAP_DEREF_SEARCHING && is_entry_alias( e ) ) {
@@ -352,14 +356,11 @@ bdb_search(
 
 			/* need to skip alias which deref into scope */
 			if( scope & LDAP_SCOPE_ONELEVEL ) {
-				char 		*pdn;
-				ber_len_t	plen;
+				struct berval	pdn;
 				
-				if ( dnParent( e->e_nname.bv_val, &pdn ) == LDAP_SUCCESS ) {
-					plen = e->e_nname.bv_len - ( pdn - e->e_nname.bv_val );
-					if ( plen != realbase.bv_len || strcmp( pdn, realbase.bv_val ) ) {
-						goto loop_continue;
-					}
+				dnParent( &e->e_nname, &pdn ):
+				if ( ber_bvcmp( pdn, &realbase ) ) {
+					goto loop_continue;
 				}
 
 			} else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
@@ -401,17 +402,15 @@ bdb_search(
 		/* if it matches the filter and scope, send it */
 		rc = test_filter( be, conn, op, e, filter );
 		if ( rc == LDAP_COMPARE_TRUE ) {
-			char	*dn;
+			struct berval	dn;
 
 			/* check scope */
 			if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
-				if ( be_issuffix( be, e->e_nname.bv_val ) ) {
+				if ( be_issuffix( be, &e->e_nname ) ) {
 					scopeok = (realbase.bv_len == 0);
 				} else {
-					dnParent( e->e_nname.bv_val, (const char **)&dn );
-					scopeok = (dn == realbase.bv_val)
-						? 1
-						: (strcmp( dn, realbase.bv_val ) ? 0 : 1 );
+					dnParent( &e->e_nname, &dn );
+					scopeok = dn_match( &dn, &realbase );
 				}
 
 			} else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
@@ -433,8 +432,14 @@ bdb_search(
 				}
 
 				if (e) {
-					int result = send_search_entry( be, conn, op,
-						e, attrs, attrsonly, NULL);
+					int result;
+					
+					if( op->o_noop ) {
+						result = 0;
+					} else {
+						result = send_search_entry( be, conn, op,
+							e, attrs, attrsonly, NULL);
+					}
 
 					switch (result) {
 					case 0:		/* entry sent ok */
@@ -544,15 +549,18 @@ static int search_candidates(
 	ID	*ids )
 {
 	int rc;
-	Filter		f, scopef, sf, rf, xf;
+	Filter		f, scopef, rf, xf;
 	ID		tmp[BDB_IDL_UM_SIZE];
 	AttributeAssertion aa_ref;
+#ifdef BDB_SUBENTRIES
+	Filter	sf;
 	AttributeAssertion aa_subentry;
-	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
+#endif
 #ifdef BDB_ALIASES
 	Filter	af;
 	AttributeAssertion aa_alias;
 #endif
+	struct bdb_info *bdb = (struct bdb_info *) be->be_private;
 
 	/*
 	 * This routine takes as input a filter (user-filter)
@@ -605,6 +613,7 @@ static int search_candidates(
 	scopef.f_dn = &e->e_nname;
 	scopef.f_next = xf.f_or == filter ? filter : &xf ;
 
+#ifdef BDB_SUBENTRIES
 	if( get_subentries_visibility( op ) ) {
 		struct berval bv_subentry = { sizeof("SUBENTRY")-1, "SUBENTRY" };
 		sf.f_choice = LDAP_FILTER_EQUALITY;
@@ -614,17 +623,9 @@ static int search_candidates(
 		sf.f_next = scopef.f_next;
 		scopef.f_next = &sf;
 	}
+#endif
 
-#ifdef BDB_FILTER_INDICES
 	rc = bdb_filter_candidates( be, &f, ids, tmp );
-#else
-	/* FIXME: Original code:
-	BDB_IDL_ID( bdb, ids, e->e_id );
-	* this is a hack to make "" base work; when bdb_filter_candidates
-	* is used this should not be needed any more */
-	BDB_IDL_ID( bdb, ids, (e->e_id == NOID ? 1 : e->e_id) );
-	rc = 0;
-#endif
 
 	Debug(LDAP_DEBUG_TRACE,
 		"bdb_search_candidates: id=%ld first=%ld last=%ld\n",