remove dbenv->lock_put() call from transaction-protected operations

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 54d6efe256b9d33c2ecea624c95d897d4571869f..ead4af626e45d00cbc9611d403c19202e12178ff 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -136,7 +136,8 @@ do_compare(
                goto cleanup;
        }
 
-       rc = value_normalize( ava.aa_desc, SLAP_MR_EQUALITY, &value, &ava.aa_value, &text );
+       rc = value_validate_normalize( ava.aa_desc, SLAP_MR_EQUALITY,
+               &value, &ava.aa_value, &text );
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
                goto cleanup;
@@ -154,7 +155,7 @@ do_compare(
 #endif
 
                Statslog( LDAP_DEBUG_STATS,
-                       "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n",
+                       "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n",
                        op->o_connid, op->o_opid, pdn.bv_val,
                        ava.aa_desc->ad_cname.bv_val, 0 );
 
@@ -182,7 +183,7 @@ do_compare(
 #endif
 
                Statslog( LDAP_DEBUG_STATS,
-                       "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n",
+                       "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n",
                        op->o_connid, op->o_opid, pdn.bv_val,
                        ava.aa_desc->ad_cname.bv_val, 0 );
 
@@ -257,7 +258,7 @@ do_compare(
            pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val );
 #endif
 
-       Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n",
+       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n",
            op->o_connid, op->o_opid, pdn.bv_val,
                ava.aa_desc->ad_cname.bv_val, 0 );
 
@@ -291,7 +292,7 @@ static int compare_entry(
        Attribute *a;
 
        if ( ! access_allowed( NULL, conn, op, e,
-               ava->aa_desc, &ava->aa_value, ACL_COMPARE ) )
+               ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL ) )
        {       
                return LDAP_INSUFFICIENT_ACCESS;
        }