Added dnPretty2/dnNormalize2 using preallocated destination berval

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

diff --git a/servers/slapd/back-ldbm/compare.c b/servers/slapd/back-ldbm/compare.c
index 4134bb115fe5500ffca26344fe73d2e034255d52..574c32d8fa78b32842f359e174d538ec34de9f78 100644 (file)
--- a/servers/slapd/back-ldbm/compare.c
+++ b/servers/slapd/back-ldbm/compare.c
@@ -21,8 +21,8 @@ ldbm_back_compare(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    const char *dn,
-    const char *ndn,
+    struct berval      *dn,
+    struct berval      *ndn,
        AttributeAssertion *ava
 )
 {
@@ -34,15 +34,14 @@ ldbm_back_compare(
        int             manageDSAit = get_manageDSAit( op );
 
        /* get entry with reader lock */
-       if ( (e = dn2entry_r( be, ndn, &matched )) == NULL ) {
+       if ( (e = dn2entry_r( be, ndn->bv_val, &matched )) == NULL ) {
                char *matched_dn = NULL;
                struct berval **refs = NULL;
 
                if ( matched != NULL ) {
                        matched_dn = ch_strdup( matched->e_dn );
                        refs = is_entry_referral( matched )
-                               ? get_entry_referrals( be, conn, op, matched,
-                                       dn, LDAP_SCOPE_DEFAULT )
+                               ? get_entry_referrals( be, conn, op, matched )
                                : NULL;
                        cache_return_entry_r( &li->li_cache, matched );
                } else {
@@ -62,11 +61,11 @@ ldbm_back_compare(
        if (!manageDSAit && is_entry_referral( e ) ) {
                /* entry is a referral, don't allow add */
                struct berval **refs = get_entry_referrals( be,
-                       conn, op, e, dn, LDAP_SCOPE_DEFAULT );
+                       conn, op, e );
 
 #ifdef NEW_LOGGING
                LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
-                          "ldbm_back_compare: entry (%s) is a referral.\n", e->e_dn ));
+                       "ldbm_back_compare: entry (%s) is a referral.\n", e->e_dn ));
 #else
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                    0, 0 );
@@ -99,10 +98,7 @@ ldbm_back_compare(
        {
                rc = LDAP_COMPARE_FALSE;
 
-               if ( value_find_ex( ava->aa_desc,
-                                   SLAP_MR_VALUE_IS_IN_MR_SYNTAX,
-                                   a->a_vals, ava->aa_value ) == 0 )
-               {
+               if ( value_find( ava->aa_desc, a->a_vals, ava->aa_value ) == 0 ) {
                        rc = LDAP_COMPARE_TRUE;
                        break;
                }