]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/search.c
projects / openldap / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Add a default case with assert() just in case.
[openldap] / servers / slapd / back-ldbm / search.c
diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 4f97aa6c1a26406c6c74b78fc0b2573ec794a5f1..c16404a3ac50bbeb89fffafb7d455169ca4b3c0c 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -1,7 +1,7 @@
 /* search.c - ldbm backend search function */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -36,8 +36,8 @@ ldbm_back_search(
     int                slimit,
     int                tlimit,
     Filter     *filter,
-    const char *filterstr,
-    struct berval      **attrs,
+    struct berval      *filterstr,
+    AttributeName      *attrs,
     int                attrsonly )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
@@ -47,9 +47,9 @@ ldbm_back_search(
        ID_BLOCK                *candidates;
        ID              id, cursor;
        Entry           *e;
-       struct berval **v2refs = NULL;
+       BerVarray               v2refs = NULL;
        Entry   *matched = NULL;
-       char    *realbase = NULL;
+       struct berval   realbase = { 0, NULL };
        int             nentries = 0;
        int             manageDSAit = get_manageDSAit( op );
        int             cscope = LDAP_SCOPE_DEFAULT;
@@ -70,7 +70,7 @@ ldbm_back_search(
                e = (Entry *) &slap_entry_root;
 
                /* need normalized dn below */
-               realbase = ch_strdup( e->e_ndn );
+               ber_dupbv( &realbase, &e->e_nname );
 
                candidates = search_candidates( be, e, filter,
                    scope, deref, manageDSAit );
@@ -85,18 +85,18 @@ ldbm_back_search(
 
        } else {
                /* get entry with reader lock */
-               e = dn2entry_r( be, nbase->bv_val, &matched );
+               e = dn2entry_r( be, nbase, &matched );
                err = e != NULL ? LDAP_SUCCESS : LDAP_REFERRAL;
                text = NULL;
        }
 
        if ( e == NULL ) {
-               struct berval *matched_dn = NULL;
-               struct berval **refs = NULL;
+               struct berval matched_dn = { 0, NULL };
+               BerVarray refs = NULL;
 
                if ( matched != NULL ) {
-                       struct berval **erefs;
-                       matched_dn = ber_bvdup( &matched->e_name );
+                       BerVarray erefs;
+                       ber_dupbv( &matched_dn, &matched->e_name );
 
                        erefs = is_entry_referral( matched )
                                ? get_entry_referrals( be, conn, op, matched )
@@ -105,10 +105,10 @@ ldbm_back_search(
                        cache_return_entry_r( &li->li_cache, matched );
 
                        if( erefs ) {
-                               refs = referral_rewrite( erefs, matched_dn,
+                               refs = referral_rewrite( erefs, &matched_dn,
                                        base, scope );
 
-                               ber_bvecfree( erefs );
+                               ber_bvarray_free( erefs );
                        }
 
                } else {
@@ -116,21 +116,23 @@ ldbm_back_search(
                                NULL, base, scope );
                }
 
-               send_ldap_result( conn, op, err,
-                       matched_dn ? matched_dn->bv_val : NULL, 
+               send_ldap_result( conn, op, err, matched_dn.bv_val, 
                        text, refs, NULL );
 
-               ber_bvecfree( refs );
-               ber_bvfree( matched_dn );
+               ber_bvarray_free( refs );
+               ber_memfree( matched_dn.bv_val );
                return 1;
        }
 
        if (!manageDSAit && is_entry_referral( e ) ) {
                /* entry is a referral, don't allow add */
-               struct berval *matched_dn = ber_bvdup( &e->e_name );
-               struct berval **erefs = get_entry_referrals( be,
-                       conn, op, e );
-               struct berval **refs = NULL;
+               struct berval matched_dn;
+               BerVarray erefs;
+               BerVarray refs;
+
+               ber_dupbv( &matched_dn, &e->e_name );
+               erefs = get_entry_referrals( be, conn, op, e );
+               refs = NULL;
 
                cache_return_entry_r( &li->li_cache, e );
 
@@ -145,24 +147,24 @@ ldbm_back_search(
 #endif
 
                if( erefs ) {
-                       refs = referral_rewrite( erefs, matched_dn,
+                       refs = referral_rewrite( erefs, &matched_dn,
                                base, scope );
 
-                       ber_bvecfree( erefs );
+                       ber_bvarray_free( erefs );
                }
 
                if( refs ) {
                        send_ldap_result( conn, op, LDAP_REFERRAL,
-                               matched_dn->bv_val, NULL, refs, NULL );
-                       ber_bvecfree( refs );
+                               matched_dn.bv_val, NULL, refs, NULL );
+                       ber_bvarray_free( refs );
 
                } else {
                        send_ldap_result( conn, op, LDAP_OTHER,
-                               matched_dn->bv_val,
+                               matched_dn.bv_val,
                        "bad referral object", NULL, NULL );
                }
 
-               ber_bvfree( matched_dn );
+               ber_memfree( matched_dn.bv_val );
                return 1;
        }
 
@@ -183,7 +185,7 @@ ldbm_back_search(
        }
 
        /* need normalized dn below */
-       realbase = ch_strdup( e->e_ndn );
+       ber_dupbv( &realbase, &e->e_nname );
 
        cache_return_entry_r( &li->li_cache, e );
 
@@ -343,13 +345,12 @@ searchit:
                        if( scope & LDAP_SCOPE_ONELEVEL ) {
                                char *pdn = dn_parent( NULL, e->e_ndn );
                                if ( pdn != NULL ) {
-                                       if( strcmp( pdn, realbase ) ) {
-                                               free( pdn );
+                                       if( strcmp( pdn, realbase.bv_val ) ) {
                                                goto loop_continue;
                                        }
                                }
 
-                       } else if ( dn_issuffix( e->e_ndn, realbase ) ) {
+                       } else if ( dnIsSuffix( &e->e_nname, &realbase ) ) {
                                /* alias is within scope */
 #ifdef NEW_LOGGING
                                LDAP_LOG(( "backend", LDAP_LEVEL_DETAIL1,
@@ -379,26 +380,24 @@ searchit:
                        /* check scope */
                        if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
                                if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
-                                       scopeok = (dn == realbase)
+                                       scopeok = (dn == realbase.bv_val)
                                                ? 1
-                                               : (strcmp( dn, realbase ) ? 0 : 1 );
+                                               : (strcmp( dn, realbase.bv_val ) ? 0 : 1 );
                                } else {
-                                       scopeok = (realbase == NULL || *realbase == '\0');
+                                       scopeok = (realbase.bv_len == 0);
                                }
 
                        } else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
-                               dn = ch_strdup( e->e_ndn );
-                               scopeok = dn_issuffix( dn, realbase );
-                               free( dn );
+                               scopeok = dnIsSuffix( &e->e_nname, &realbase );
 
                        } else {
                                scopeok = 1;
                        }
 
                        if( scopeok ) {
-                               struct berval **erefs = get_entry_referrals(
+                               BerVarray erefs = get_entry_referrals(
                                        be, conn, op, e );
-                               struct berval **refs = referral_rewrite( erefs,
+                               BerVarray refs = referral_rewrite( erefs,
                                        &e->e_name, NULL,
                                        scope == LDAP_SCOPE_SUBTREE
                                                ? LDAP_SCOPE_SUBTREE
@@ -407,7 +406,7 @@ searchit:
                                send_search_reference( be, conn, op,
                                        e, refs, NULL, &v2refs );
 
-                               ber_bvecfree( refs );
+                               ber_bvarray_free( refs );
 
                        } else {
 #ifdef NEW_LOGGING
@@ -431,17 +430,15 @@ searchit:
                        /* check scope */
                        if ( !scopeok && scope == LDAP_SCOPE_ONELEVEL ) {
                                if ( (dn = dn_parent( be, e->e_ndn )) != NULL ) {
-                                       scopeok = (dn == realbase)
+                                       scopeok = (dn == realbase.bv_val)
                                                ? 1
-                                               : (strcmp( dn, realbase ) ? 0 : 1 );
+                                               : (strcmp( dn, realbase.bv_val ) ? 0 : 1 );
                                } else {
-                                       scopeok = (realbase == NULL || *realbase == '\0');
+                                       scopeok = (realbase.bv_len == 0);
                                }
 
                        } else if ( !scopeok && scope == LDAP_SCOPE_SUBTREE ) {
-                               dn = ch_strdup( e->e_ndn );
-                               scopeok = dn_issuffix( dn, realbase );
-                               free( dn );
+                               scopeok = dnIsSuffix( &e->e_nname, &realbase );
 
                        } else {
                                scopeok = 1;
@@ -515,8 +512,8 @@ done:
        if( candidates != NULL )
                idl_free( candidates );
 
-       ber_bvecfree( v2refs );
-       if( realbase ) free( realbase );
+       if( v2refs ) ber_bvarray_free( v2refs );
+       if( realbase.bv_val ) free( realbase.bv_val );
 
        return rc;
 }
Cloned from git://git.openldap.org/openldap.git