Fallout from ITS#4986 - remove unused param of select_backend()

[openldap] / servers / slapd / search.c

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 9478b19c3eea53e2c76b32ac9734f196cf57d929..828c1fc70c12d84281f4f3ea12f9701decacf927 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-2006 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -239,12 +239,8 @@ return_results:;
 int
 fe_op_search( Operation *op, SlapReply *rs )
 {
-       int                     manageDSAit;
-       int                     be_manageDSAit;
        BackendDB               *bd = op->o_bd;
 
-       manageDSAit = get_manageDSAit( op );
-
        /* fake while loop to allow breaking out */
        while ( op->ors_scope == LDAP_SCOPE_BASE ) {
                Entry *entry = NULL;
@@ -320,9 +316,7 @@ fe_op_search( Operation *op, SlapReply *rs )
         * if we don't hold it.
         */
 
-       be_manageDSAit = manageDSAit;
-
-       op->o_bd = select_backend( &op->o_req_ndn, be_manageDSAit, 1 );
+       op->o_bd = select_backend( &op->o_req_ndn, 1 );
        if ( op->o_bd == NULL ) {
                rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &op->o_req_dn, op->ors_scope );
@@ -340,7 +334,6 @@ fe_op_search( Operation *op, SlapReply *rs )
 
        /* check restrictions */
        if( backend_check_restrictions( op, rs, NULL ) != LDAP_SUCCESS ) {
-               op->o_bd = bd;
                send_ldap_result( op, rs );
                goto return_results;
        }
@@ -350,15 +343,33 @@ fe_op_search( Operation *op, SlapReply *rs )
                goto return_results;
        }
 
-       /* actually do the search and send the result(s) */
-       if ( op->o_bd->be_search ) {
+       if ( SLAP_SHADOW(op->o_bd) && get_dontUseCopy(op) ) {
+               /* don't use shadow copy */
+               BerVarray defref = op->o_bd->be_update_refs
+                       ? op->o_bd->be_update_refs : default_referral;
+
+               if( defref != NULL ) {
+                       rs->sr_ref = referral_rewrite( defref,
+                               NULL, &op->o_req_dn, op->ors_scope );
+                       if( !rs->sr_ref) rs->sr_ref = defref;
+                       rs->sr_err = LDAP_REFERRAL;
+                       send_ldap_result( op, rs );
+
+                       if (rs->sr_ref != defref) ber_bvarray_free( rs->sr_ref );
+
+               } else {
+                       send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                               "copy not used; no referral information available" );
+               }
+
+       } else if ( op->o_bd->be_search ) {
                if ( limits_check( op, rs ) == 0 ) {
+                       /* actually do the search and send the result(s) */
                        (op->o_bd->be_search)( op, rs );
                }
                /* else limits_check() sends error */
 
        } else {
-               op->o_bd = bd;
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                        "operation not supported within namingContext" );
        }