More unifdef SLAPD_MULTIMASTER cleanup

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

diff --git a/servers/slapd/back-ldbm/search.c b/servers/slapd/back-ldbm/search.c
index 633b7c23720fb16c712bf5254021a9e2d804e339..0f949ca5b00aa35d7d33dc4634259ad9a910ebd1 100644 (file)
--- a/servers/slapd/back-ldbm/search.c
+++ b/servers/slapd/back-ldbm/search.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -272,7 +272,6 @@ searchit:
 
                rs->sr_entry = e;
 
-#ifdef LDBM_SUBENTRIES
                if ( is_entry_subentry( e ) ) {
                        if( op->ors_scope != LDAP_SCOPE_BASE ) {
                                if(!get_subentries_visibility( op )) {
@@ -289,7 +288,6 @@ searchit:
                        /* only subentries are visible */
                        goto loop_continue;
                }
-#endif
 
                if ( op->ors_deref & LDAP_DEREF_SEARCHING &&
                        is_entry_alias( e ) )
@@ -417,13 +415,11 @@ searchit:
                        {
                                scopeok = dnIsSuffix( &e->e_nname, &realbase );
 
-#ifdef LDAP_SCOPE_SUBORDINATE
                        } else if ( !scopeok &&
                                op->ors_scope == LDAP_SCOPE_SUBORDINATE )
                        {
                                scopeok = !dn_match( &e->e_nname, &realbase )
                                        && dnIsSuffix( &e->e_nname, &realbase );
-#endif
 
                        } else {
                                scopeok = 1;
@@ -519,10 +515,8 @@ search_candidates(
     AttributeAssertion aa_ref, aa_alias;
        struct berval bv_ref = { sizeof("referral")-1, "referral" };
        struct berval bv_alias = { sizeof("alias")-1, "alias" };
-#ifdef LDBM_SUBENTRIES
        Filter  sf;
        AttributeAssertion aa_subentry;
-#endif
 
        Debug(LDAP_DEBUG_TRACE,
                "search_candidates: base=\"%s\" s=%d d=%d\n",
@@ -562,7 +556,6 @@ search_candidates(
        fand.f_dn = &e->e_nname;
        fand.f_next = xf.f_or == filter ? filter : &xf ;
 
-#ifdef LDBM_SUBENTRIES
        if ( get_subentries_visibility( op )) {
                struct berval bv_subentry = { sizeof("SUBENTRY")-1, "SUBENTRY" };
                sf.f_choice = LDAP_FILTER_EQUALITY;
@@ -572,7 +565,6 @@ search_candidates(
                sf.f_next = fand.f_next;
                fand.f_next = &sf;
        }
-#endif
 
        candidates = filter_candidates( op, &f );
        return( candidates );