Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-bdb / compare.c

diff --git a/servers/slapd/back-bdb/compare.c b/servers/slapd/back-bdb/compare.c
index c333fa5247f26b9b42b5ab2dea41f13462e1e971..471ff8072cfc4338dccf3f30aa8fe25b61895b63 100644 (file)
--- a/servers/slapd/back-bdb/compare.c
+++ b/servers/slapd/back-bdb/compare.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2000-2010 The OpenLDAP Foundation.
+ * Copyright 2000-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -27,7 +27,6 @@ bdb_compare( Operation *op, SlapReply *rs )
        struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
        Entry           *e = NULL;
        EntryInfo       *ei;
-       Attribute       *a;
        int             manageDSAit = get_manageDSAit( op );
 
        DB_TXN          *rtxn;
@@ -122,19 +121,6 @@ dn2entry_retry:
                goto done;
        }
 
-       if ( get_assert( op ) &&
-               ( test_filter( op, e, get_assertion( op )) != LDAP_COMPARE_TRUE ))
-       {
-               if ( !access_allowed( op, e, slap_schema.si_ad_entry,
-                       NULL, ACL_DISCLOSE, NULL ) )
-               {
-                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
-               } else {
-                       rs->sr_err = LDAP_ASSERTION_FAILED;
-               }
-               goto return_results;
-       }
-
        rs->sr_err = slap_compare_entry( op, e, op->orc_ava );
 
 return_results: