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

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 55dca8040574af004bda49dc380f1cea6ba38043..3683087a298dc7c5ac4cb7ab5e54c5f576d9a048 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.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
@@ -136,7 +136,6 @@ int
 fe_op_compare( Operation *op, SlapReply *rs )
 {
        Entry                   *entry = NULL;
-       int                     manageDSAit;
        AttributeAssertion      ava = *op->orc_ava;
        BackendDB               *bd = op->o_bd;
 
@@ -201,14 +200,12 @@ fe_op_compare( Operation *op, SlapReply *rs )
                goto cleanup;
        }
 
-       manageDSAit = get_manageDSAit( op );
-
        /*
         * We could be serving multiple database backends.  Select the
         * appropriate one, or send a referral to our "referral server"
         * if we don't hold it.
         */
-       op->o_bd = select_backend( &op->o_req_ndn, manageDSAit, 0 );
+       op->o_bd = select_backend( &op->o_req_ndn, 0 );
        if ( op->o_bd == NULL ) {
                rs->sr_ref = referral_rewrite( default_referral,
                        NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
@@ -243,7 +240,13 @@ fe_op_compare( Operation *op, SlapReply *rs )
                ava.aa_desc->ad_cname.bv_val, 0, 0 );
 
        op->orc_ava = &ava;
-       if ( ava.aa_desc == slap_schema.si_ad_entryDN ) {
+
+       if ( SLAP_SHADOW(op->o_bd) && get_dontUseCopy(op) ) {
+               /* don't use shadow copy */
+               send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+                       "copy not used" );
+
+       } else if ( ava.aa_desc == slap_schema.si_ad_entryDN ) {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
                        "entryDN compare not supported" );