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 b3494b4964fba9a26cb590330beb9d862e362005..18b50dbf2e32c2cd5eff97930291e0e332ca72e0 100644 (file)
--- a/servers/slapd/back-ldbm/compare.c
+++ b/servers/slapd/back-ldbm/compare.c
@@ -33,6 +33,9 @@ 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;
@@ -49,6 +52,8 @@ 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 );
 
@@ -82,7 +87,7 @@ ldbm_back_compare(
        }
 
        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 );
 }