Remove abandon cruft

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

diff --git a/servers/slapd/back-ldbm/compare.c b/servers/slapd/back-ldbm/compare.c
index 4fff70baa5751ed243ed08327b2e9634a4b89ee9..366673a1d99ab541963bea0fa1c68ee71da95211 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-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -21,9 +21,9 @@ ldbm_back_compare(
     Backend    *be,
     Connection *conn,
     Operation  *op,
-    char       *dn,
-    char       *ndn,
-    Ava                *ava
+    struct berval      *dn,
+    struct berval      *ndn,
+       AttributeAssertion *ava
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
@@ -34,7 +34,7 @@ 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;
 
@@ -45,16 +45,15 @@ ldbm_back_compare(
                                : NULL;
                        cache_return_entry_r( &li->li_cache, matched );
                } else {
-                       refs = default_referral;
+                       refs = referral_rewrite( default_referral,
+                               NULL, dn, LDAP_SCOPE_DEFAULT );
                }
 
                send_ldap_result( conn, op, LDAP_REFERRAL,
                        matched_dn, NULL, refs, NULL );
 
-               if( matched != NULL ) {
-                       ber_bvecfree( refs );
-                       free( matched_dn );
-               }
+               ber_bvecfree( refs );
+               free( matched_dn );
 
                return( 1 );
        }
@@ -64,8 +63,14 @@ ldbm_back_compare(
                struct berval **refs = get_entry_referrals( be,
                        conn, op, e );
 
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "backend", LDAP_LEVEL_INFO,
+                       "ldbm_back_compare: entry (%s) is a referral.\n", e->e_dn ));
+#else
                Debug( LDAP_DEBUG_TRACE, "entry is referral\n", 0,
                    0, 0 );
+#endif
+
 
                send_ldap_result( conn, op, LDAP_REFERRAL,
                    e->e_dn, NULL, refs, NULL );
@@ -77,7 +82,7 @@ ldbm_back_compare(
        }
 
        if ( ! access_allowed( be, conn, op, e,
-               ava->ava_type, &ava->ava_value, ACL_COMPARE ) )
+               ava->aa_desc, &ava->aa_value, ACL_COMPARE ) )
        {
                send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
                        NULL, NULL, NULL, NULL );
@@ -85,23 +90,28 @@ ldbm_back_compare(
                goto return_results;
        }
 
-       if ( (a = attr_find( e->e_attrs, ava->ava_type )) == NULL ) {
-               send_ldap_result( conn, op, LDAP_NO_SUCH_ATTRIBUTE,
-                       NULL, NULL, NULL, NULL );
-               rc = 1;
-               goto return_results;
+       rc = LDAP_NO_SUCH_ATTRIBUTE;
+
+       for(a = attrs_find( e->e_attrs, ava->aa_desc );
+               a != NULL;
+               a = attrs_find( a->a_next, ava->aa_desc ))
+       {
+               rc = LDAP_COMPARE_FALSE;
+
+               if ( value_find( ava->aa_desc, a->a_vals, &ava->aa_value ) == 0 ) {
+                       rc = LDAP_COMPARE_TRUE;
+                       break;
+               }
+
        }
 
-#ifdef SLAPD_SCHEMA_COMPAT
-       if ( value_find( a->a_vals, &ava->ava_value, a->a_syntax, 1 ) == 0 ) 
-               send_ldap_result( conn, op, LDAP_COMPARE_TRUE,
-                       NULL, NULL, NULL, NULL );
-       else
-#endif
-               send_ldap_result( conn, op, LDAP_COMPARE_FALSE,
-                       NULL, NULL, NULL, NULL );
+       send_ldap_result( conn, op, rc,
+               NULL, NULL, NULL, NULL );
+
+       if( rc != LDAP_NO_SUCH_ATTRIBUTE ) {
+               rc = 0;
+       }
 
-       rc = 0;
 
 return_results:;
        cache_return_entry_r( &li->li_cache, e );