cleanup

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index d1be21a9834db78509dcfef17773b4b6f01a5d19..97ca38283c2e231f6afac5af82f240c07cc0a5bd 100644 (file)
--- 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-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -92,9 +92,7 @@ do_search(
        case LDAP_SCOPE_BASE:
        case LDAP_SCOPE_ONELEVEL:
        case LDAP_SCOPE_SUBTREE:
-#ifdef LDAP_SCOPE_SUBORDINATE
        case LDAP_SCOPE_SUBORDINATE:
-#endif
                break;
        default:
                send_ldap_error( op, rs, LDAP_PROTOCOL_ERROR, "invalid scope" );
@@ -243,6 +241,7 @@ fe_op_search( Operation *op, SlapReply *rs )
 {
        int                     manageDSAit;
        int                     be_manageDSAit;
+       BackendDB               *bd = op->o_bd;
 
        manageDSAit = get_manageDSAit( op );
 
@@ -283,6 +282,13 @@ fe_op_search( Operation *op, SlapReply *rs )
                        rs->sr_err = test_filter( op, entry, op->ors_filter );
 
                        if( rs->sr_err == LDAP_COMPARE_TRUE ) {
+                               /* note: we set no limits because either
+                                * no limit is specified, or at least 1
+                                * is specified, and we're going to return
+                                * at most one entry */                 
+                               op->ors_slimit = SLAP_NO_LIMIT;
+                               op->ors_tlimit = SLAP_NO_LIMIT;
+
                                rs->sr_entry = entry;
                                rs->sr_attrs = op->ors_attrs;
                                rs->sr_operational_attrs = NULL;
@@ -323,9 +329,8 @@ fe_op_search( Operation *op, SlapReply *rs )
 
                if (!rs->sr_ref) rs->sr_ref = default_referral;
                rs->sr_err = LDAP_REFERRAL;
-               op->o_bd = frontendDB;
+               op->o_bd = bd;
                send_ldap_result( op, rs );
-               op->o_bd = NULL;
 
                if (rs->sr_ref != default_referral)
                ber_bvarray_free( rs->sr_ref );
@@ -357,6 +362,7 @@ fe_op_search( Operation *op, SlapReply *rs )
        }
 
 return_results:;
+       op->o_bd = bd;
        return rs->sr_err;
 }