/* compare.c - ldbm backend compare routine */
/* $OpenLDAP$ */
/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
Backend *be,
Connection *conn,
Operation *op,
- char *dn,
- char *ndn,
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
+ struct berval *dn,
+ struct berval *ndn,
AttributeAssertion *ava
-#else
- Ava *ava
-#endif
)
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
/* get entry with reader lock */
if ( (e = dn2entry_r( be, ndn, &matched )) == NULL ) {
char *matched_dn = NULL;
- struct berval **refs = NULL;
+ BerVarray refs = NULL;
if ( matched != NULL ) {
matched_dn = ch_strdup( matched->e_dn );
: 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 );
- }
+ if ( refs ) ber_bvarray_free( refs );
+ free( matched_dn );
return( 1 );
}
if (!manageDSAit && is_entry_referral( e ) ) {
/* entry is a referral, don't allow add */
- struct berval **refs = get_entry_referrals( be,
+ BerVarray 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 );
- ber_bvecfree( refs );
+ if (refs ) ber_bvarray_free( refs );
rc = 1;
goto return_results;
}
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- if ( ! access_allowed( be, conn, op, e,
- ava->aa_desc, ava->aa_value, ACL_COMPARE ) )
-#else
if ( ! access_allowed( be, conn, op, e,
- ava->ava_type, &ava->ava_value, ACL_COMPARE ) )
-#endif
+ ava->aa_desc, &ava->aa_value, ACL_COMPARE ) )
{
send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
NULL, NULL, NULL, NULL );
rc = LDAP_NO_SUCH_ATTRIBUTE;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
for(a = attrs_find( e->e_attrs, ava->aa_desc );
a != NULL;
- a = attrs_find( a, ava->aa_desc ))
-#else
- if ((a = attr_find( e->e_attrs, ava->ava_type )) != NULL )
-#endif
+ a = attrs_find( a->a_next, ava->aa_desc ))
{
rc = LDAP_COMPARE_FALSE;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- /* not yet implemented */
-#else
- if ( value_find( a->a_vals, &ava->ava_value, a->a_syntax, 1 ) == 0 )
-#endif
- {
+ if ( value_find( ava->aa_desc, a->a_vals, &ava->aa_value ) == 0 ) {
rc = LDAP_COMPARE_TRUE;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
break;
-#endif
}
}