Set peeraddr also for IPv6, fixes ITS#1918

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

diff --git a/servers/slapd/back-ldbm/compare.c b/servers/slapd/back-ldbm/compare.c
index 3316645de5f96d10ca8464271c9361626d0f5c38..18b50dbf2e32c2cd5eff97930291e0e332ca72e0 100644 (file)
--- a/servers/slapd/back-ldbm/compare.c
+++ b/servers/slapd/back-ldbm/compare.c
@@ -1,7 +1,7 @@
 /* compare.c - ldbm backend compare routine */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -33,10 +33,13 @@ ldbm_back_compare(
        int             rc;
        int             manageDSAit = get_manageDSAit( op );
 
+       /* grab giant lock for reading */
+       ldap_pvt_thread_rdwr_rlock(&li->li_giant_rwlock);
+
        /* get entry with reader lock */
        if ( (e = dn2entry_r( be, ndn, &matched )) == NULL ) {
                char *matched_dn = NULL;
-               BVarray refs = NULL;
+               BerVarray refs = NULL;
 
                if ( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
@@ -49,10 +52,12 @@ ldbm_back_compare(
                                NULL, dn, LDAP_SCOPE_DEFAULT );
                }
 
+               ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
+
                send_ldap_result( conn, op, LDAP_REFERRAL,
                        matched_dn, NULL, refs, NULL );
 
-               if ( refs ) bvarray_free( refs );
+               if ( refs ) ber_bvarray_free( refs );
                free( matched_dn );
 
                return( 1 );
@@ -60,7 +65,7 @@ ldbm_back_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
@@ -75,14 +80,14 @@ ldbm_back_compare(
                send_ldap_result( conn, op, LDAP_REFERRAL,
                    e->e_dn, NULL, refs, NULL );
 
-               if (refs ) bvarray_free( refs );
+               if (refs ) ber_bvarray_free( refs );
 
                rc = 1;
                goto return_results;
        }
 
        if ( ! access_allowed( be, conn, op, e,
-               ava->aa_desc, &ava->aa_value, ACL_COMPARE ) )
+               ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL ) )
        {
                send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
                        NULL, NULL, NULL, NULL );
@@ -102,7 +107,6 @@ ldbm_back_compare(
                        rc = LDAP_COMPARE_TRUE;
                        break;
                }
-
        }
 
        send_ldap_result( conn, op, rc,
@@ -115,5 +119,6 @@ ldbm_back_compare(
 
 return_results:;
        cache_return_entry_r( &li->li_cache, e );
+       ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
        return( rc );
 }