X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fsearch.c;h=b6eb2832f4c952b9401a359d40a242cc609656d1;hb=5747896ba081ff998fd97863de26d2f4af59bbd2;hp=6d9f57480ab17f9a8e5cdff157c3670e55192d46;hpb=473f3ab840ae1d8d026e3c0a7d16f232f90867bb;p=openldap

diff --git a/servers/slapd/search.c b/servers/slapd/search.c
index 6d9f57480a..b6eb2832f4 100644
--- 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 );
 
@@ -330,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 );
@@ -351,9 +349,28 @@ 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 */
@@ -364,6 +381,7 @@ fe_op_search( Operation *op, SlapReply *rs )
 	}
 
 return_results:;
+	op->o_bd = bd;
 	return rs->sr_err;
 }