Revert most of last change

[openldap] / servers / slapd / back-bdb / search.c

diff --git a/servers/slapd/back-bdb/search.c b/servers/slapd/back-bdb/search.c
index ec841d7597dbff92908b21a3e5af6e0eddc6748a..34197d090b9f921cd8b33dfae5cb49bbc909fe27 100644 (file)
--- a/servers/slapd/back-bdb/search.c
+++ b/servers/slapd/back-bdb/search.c
@@ -78,7 +78,7 @@ bdb_search(
        } else
 #endif
        {
-               rc = bdb_dn2entry( be, NULL, nbase, &e, &matched, 0 );
+               rc = bdb_dn2entry_r( be, NULL, nbase, &e, &matched, 0 );
        }
 
        switch(rc) {
@@ -86,6 +86,12 @@ bdb_search(
        case 0:
                break;
        default:
+               if (e != NULL) {
+                       bdb_cache_return_entry_w(&bdb->bi_cache, e);
+               }
+               if (matched != NULL) {
+                       bdb_cache_return_entry_r(&bdb->bi_cache, matched);
+               }
                send_ldap_result( conn, op, rc=LDAP_OTHER,
                        NULL, "internal error", NULL, NULL );
                return rc;
@@ -104,7 +110,7 @@ bdb_search(
                                ? get_entry_referrals( be, conn, op, matched )
                                : NULL;
 
-                       bdb_entry_return( be, matched );
+                       bdb_cache_return_entry_r (&bdb->bi_cache, matched);
                        matched = NULL;
 
                        if( erefs ) {
@@ -135,7 +141,7 @@ bdb_search(
                erefs = get_entry_referrals( be, conn, op, e );
                refs = NULL;
 
-               bdb_entry_return( be, e );
+               bdb_cache_return_entry_r( &bdb->bi_cache, e );
                e = NULL;
 
                if( erefs ) {
@@ -245,7 +251,7 @@ bdb_search(
        cursor = e->e_id == NOID ? 1 : e->e_id;
 
        if ( e != &slap_entry_root ) {
-               bdb_entry_return( be, e );
+               bdb_cache_return_entry_r(&bdb->bi_cache, e);
        }
        e = NULL;
 
@@ -296,7 +302,7 @@ bdb_search(
                }
 
                /* get the entry with reader lock */
-               rc = bdb_id2entry( be, NULL, id, &e );
+               rc = bdb_id2entry_r( be, NULL, id, &e );
 
                if ( e == NULL ) {
                        if( !BDB_IDL_IS_RANGE(candidates) ) {
@@ -309,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 ) ) {
@@ -346,11 +356,11 @@ bdb_search(
 
                        /* need to skip alias which deref into scope */
                        if( scope & LDAP_SCOPE_ONELEVEL ) {
-                               char *pdn = dn_parent( NULL, e->e_ndn );
-                               if ( pdn != NULL ) {
-                                       if( strcmp( pdn, realbase.bv_val ) ) {
-                                               goto loop_continue;
-                                       }
+                               struct berval   pdn;
+                               
+                               dnParent( &e->e_nname, &pdn ):
+                               if ( ber_bvcmp( pdn, &realbase ) ) {
+                                       goto loop_continue;
                                }
 
                        } else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
@@ -392,16 +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 ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
-                                       scopeok = (dn == realbase.bv_val)
-                                               ? 1
-                                               : (strcmp( dn, realbase.bv_val ) ? 0 : 1 );
-                               } else {
+                               if ( be_issuffix( be, &e->e_nname ) ) {
                                        scopeok = (realbase.bv_len == 0);
+                               } else {
+                                       dnParent( &e->e_nname, &dn );
+                                       scopeok = dn_match( &dn, &realbase );
                                }
 
                        } else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
@@ -414,7 +423,7 @@ bdb_search(
                        if ( scopeok ) {
                                /* check size limit */
                                if ( --slimit == -1 ) {
-                                       bdb_entry_return( be, e );
+                                       bdb_cache_return_entry_r (&bdb->bi_cache, e);
                                        e = NULL;
                                        send_search_result( conn, op,
                                                rc = LDAP_SIZELIMIT_EXCEEDED, NULL, NULL,
@@ -423,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 */
@@ -433,7 +448,7 @@ bdb_search(
                                        case 1:         /* entry not sent */
                                                break;
                                        case -1:        /* connection closed */
-                                               bdb_entry_return( be, e );
+                                               bdb_cache_return_entry_r(&bdb->bi_cache, e);
                                                e = NULL;
                                                rc = LDAP_OTHER;
                                                goto done;
@@ -453,7 +468,8 @@ bdb_search(
 loop_continue:
                if( e != NULL ) {
                        /* free reader lock */
-                       bdb_entry_return( be, e );
+                        bdb_cache_return_entry_r ( &bdb->bi_cache, e );
+                        e = NULL;
                }
 
                ldap_pvt_thread_yield();
@@ -465,6 +481,11 @@ loop_continue:
        rc = 0;
 
 done:
+       if( e != NULL ) {
+               /* free reader lock */
+               bdb_cache_return_entry_r ( &bdb->bi_cache, e );
+       }
+
        if( v2refs ) ber_bvarray_free( v2refs );
        if( realbase.bv_val ) ch_free( realbase.bv_val );
 
@@ -528,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)
@@ -589,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;
@@ -598,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",