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 f595658e1b2dde4b2f52e1556afc16ae7ac5f68b..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-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2012 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -20,7 +20,6 @@
 #include <ac/string.h>
 
 #include "back-bdb.h"
-#include "external.h"
 
 int
 bdb_compare( Operation *op, SlapReply *rs )
@@ -28,13 +27,12 @@ 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 );
 
-       u_int32_t       locker;
+       DB_TXN          *rtxn;
        DB_LOCK         lock;
 
-       rs->sr_err = LOCK_ID(bdb->bi_dbenv, &locker);
+       rs->sr_err = bdb_reader_get(op, bdb->bi_dbenv, &rtxn);
        switch(rs->sr_err) {
        case 0:
                break;
@@ -45,7 +43,8 @@ bdb_compare( Operation *op, SlapReply *rs )
 
 dn2entry_retry:
        /* get entry */
-       rs->sr_err = bdb_dn2entry( op, NULL, &op->o_req_ndn, &ei, 1, locker, &lock );
+       rs->sr_err = bdb_dn2entry( op, rtxn, &op->o_req_ndn, &ei, 1,
+               &lock );
 
        switch( rs->sr_err ) {
        case DB_NOTFOUND:
@@ -66,19 +65,29 @@ dn2entry_retry:
        e = ei->bei_e;
        if ( rs->sr_err == DB_NOTFOUND ) {
                if ( e != NULL ) {
-                       rs->sr_matched = ch_strdup( e->e_dn );
-                       rs->sr_ref = is_entry_referral( e )
-                               ? get_entry_referrals( op, e )
-                               : NULL;
-                       bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
+                       /* return referral only if "disclose" is granted on the object */
+                       if ( ! access_allowed( op, e, slap_schema.si_ad_entry,
+                               NULL, ACL_DISCLOSE, NULL ) )
+                       {
+                               rs->sr_err = LDAP_NO_SUCH_OBJECT;
+
+                       } else {
+                               rs->sr_matched = ch_strdup( e->e_dn );
+                               rs->sr_ref = is_entry_referral( e )
+                                       ? get_entry_referrals( op, e )
+                                       : NULL;
+                               rs->sr_err = LDAP_REFERRAL;
+                       }
+
+                       bdb_cache_return_entry_r( bdb, e, &lock );
                        e = NULL;
 
                } else {
-                       rs->sr_ref = referral_rewrite( SLAPD_GLOBAL(default_referral),
+                       rs->sr_ref = referral_rewrite( default_referral,
                                NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
+                       rs->sr_err = rs->sr_ref ? LDAP_REFERRAL : LDAP_NO_SUCH_OBJECT;
                }
 
-               rs->sr_err = LDAP_REFERRAL;
                send_ldap_result( op, rs );
 
                ber_bvarray_free( rs->sr_ref );
@@ -90,14 +99,20 @@ dn2entry_retry:
        }
 
        if (!manageDSAit && is_entry_referral( e ) ) {
-               /* entry is a referral, don't allow add */
-               rs->sr_ref = get_entry_referrals( op, e );
+               /* return referral only if "disclose" is granted on the object */
+               if ( !access_allowed( op, e, slap_schema.si_ad_entry,
+                       NULL, ACL_DISCLOSE, NULL ) )
+               {
+                       rs->sr_err = LDAP_NO_SUCH_OBJECT;
+               } else {
+                       /* entry is a referral, don't allow compare */
+                       rs->sr_ref = get_entry_referrals( op, e );
+                       rs->sr_err = LDAP_REFERRAL;
+                       rs->sr_matched = e->e_name.bv_val;
+               }
 
-               Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
-                       0, 0 );
+               Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0, 0, 0 );
 
-               rs->sr_err = LDAP_REFERRAL;
-               rs->sr_matched = e->e_name.bv_val;
                send_ldap_result( op, rs );
 
                ber_bvarray_free( rs->sr_ref );
@@ -106,52 +121,23 @@ dn2entry_retry:
                goto done;
        }
 
-       if ( get_assert( op ) &&
-               ( test_filter( op, e, get_assertion( op )) != LDAP_COMPARE_TRUE ))
-       {
-               rs->sr_err = LDAP_ASSERTION_FAILED;
-               goto return_results;
-       }
-
-       rs->sr_err = access_allowed( op, e, op->oq_compare.rs_ava->aa_desc,
-               &op->oq_compare.rs_ava->aa_value, ACL_COMPARE, NULL );
-       if ( ! rs->sr_err ) {
-               rs->sr_err = LDAP_INSUFFICIENT_ACCESS;
-               goto return_results;
-       }
-
-       rs->sr_err = LDAP_NO_SUCH_ATTRIBUTE;
-
-       for(a = attrs_find( e->e_attrs, op->oq_compare.rs_ava->aa_desc );
-               a != NULL;
-               a = attrs_find( a->a_next, op->oq_compare.rs_ava->aa_desc ))
-       {
-               rs->sr_err = LDAP_COMPARE_FALSE;
-
-               if ( value_find_ex( op->oq_compare.rs_ava->aa_desc,
-                       SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
-                               SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
-                       a->a_nvals, &op->oq_compare.rs_ava->aa_value, op->o_tmpmemctx ) == 0 )
-               {
-                       rs->sr_err = LDAP_COMPARE_TRUE;
-                       break;
-               }
-       }
+       rs->sr_err = slap_compare_entry( op, e, op->orc_ava );
 
 return_results:
        send_ldap_result( op, rs );
 
-       if( rs->sr_err == LDAP_COMPARE_FALSE || rs->sr_err == LDAP_COMPARE_TRUE ) {
+       switch ( rs->sr_err ) {
+       case LDAP_COMPARE_FALSE:
+       case LDAP_COMPARE_TRUE:
                rs->sr_err = LDAP_SUCCESS;
+               break;
        }
 
 done:
        /* free entry */
-       if( e != NULL ) {
-               bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
+       if ( e != NULL ) {
+               bdb_cache_return_entry_r( bdb, e, &lock );
        }
 
-       LOCK_ID_FREE ( bdb->bi_dbenv, locker );
-
        return rs->sr_err;
 }