Cancel exop updates

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

diff --git a/servers/slapd/back-bdb/compare.c b/servers/slapd/back-bdb/compare.c
index 41b977b364a23c8d7ac61ebf1ca36af396767bbe..df74448224530dea8c1c4c1677371bfc22ba34cb 100644 (file)
--- a/servers/slapd/back-bdb/compare.c
+++ b/servers/slapd/back-bdb/compare.c
@@ -1,7 +1,7 @@
 /* compare.c - bdb backend compare routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -31,13 +31,33 @@ bdb_compare(
        const char      *text = NULL;
        int             manageDSAit = get_manageDSAit( op );
 
+       u_int32_t       locker;
+       DB_LOCK         lock;
+
+       rc = LOCK_ID(bdb->bi_dbenv, &locker);
+       switch(rc) {
+       case 0:
+               break;
+       default:
+               send_ldap_result( conn, op, rc=LDAP_OTHER,
+                       NULL, "internal error", NULL, NULL );
+               return rc;
+       }
+
+dn2entry_retry:
        /* get entry */
-       rc = bdb_dn2entry( be, NULL, ndn, &e, &matched, 0 );
+       rc = bdb_dn2entry_r( be, NULL, ndn, &e, &matched, 0, locker, &lock );
 
        switch( rc ) {
        case DB_NOTFOUND:
        case 0:
                break;
+       case LDAP_BUSY:
+               text = "ldap server busy";
+               goto return_results;
+       case DB_LOCK_DEADLOCK:
+       case DB_LOCK_NOTGRANTED:
+               goto dn2entry_retry;
        default:
                rc = LDAP_OTHER;
                text = "internal error";
@@ -46,14 +66,14 @@ bdb_compare(
 
        if ( e == NULL ) {
                char *matched_dn = NULL;
-               BVarray refs;
+               BerVarray refs;
 
                if ( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
                        refs = is_entry_referral( matched )
                                ? get_entry_referrals( be, conn, op, matched )
                                : NULL;
-                       bdb_entry_return( be, matched );
+                       bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, matched, &lock );
                        matched = NULL;
 
                } else {
@@ -64,7 +84,7 @@ bdb_compare(
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        matched_dn, NULL, refs, NULL );
 
-               bvarray_free( refs );
+               ber_bvarray_free( refs );
                free( matched_dn );
 
                goto done;
@@ -72,22 +92,27 @@ bdb_compare(
 
        if (!manageDSAit && is_entry_referral( e ) ) {
                /* entry is a referral, don't allow add */
-               BVarray refs = get_entry_referrals( be,
+               BerVarray refs = get_entry_referrals( be,
                        conn, op, e );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG ( OPERATION, DETAIL1, 
+                       "bdb_compare: entry is referral\n", 0, 0, 0 );
+#else
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                        0, 0 );
+#endif
 
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        e->e_dn, NULL, refs, NULL );
 
-               bvarray_free( refs );
+               ber_bvarray_free( refs );
                goto done;
        }
 
-       if ( ! access_allowed( be, conn, op, e,
-               ava->aa_desc, &ava->aa_value, ACL_COMPARE ) )
-       {
+       rc = access_allowed( be, conn, op, e,
+               ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL );
+       if ( ! rc ) {
                rc = LDAP_INSUFFICIENT_ACCESS;
                goto return_results;
        }
@@ -104,23 +129,23 @@ bdb_compare(
                        rc = LDAP_COMPARE_TRUE;
                        break;
                }
-
        }
 
-       if( rc != LDAP_NO_SUCH_ATTRIBUTE ) {
-               rc = LDAP_SUCCESS;
-       }
-
-
 return_results:
-       send_ldap_result( conn, op, LDAP_SUCCESS,
+       send_ldap_result( conn, op, rc,
                NULL, text, NULL, NULL );
 
+       if( rc == LDAP_COMPARE_FALSE || rc == LDAP_COMPARE_TRUE ) {
+               rc = LDAP_SUCCESS;
+       }
+
 done:
        /* free entry */
        if( e != NULL ) {
-               bdb_entry_return( be, e );
+               bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
        }
 
+       LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+
        return rc;
 }