/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/*
#include "ldap_pvt.h"
#include "slap.h"
+static int compare_entry(
+ Connection *conn,
+ Operation *op,
+ Entry *e,
+ AttributeAssertion *ava );
+
int
do_compare(
Connection *conn,
Operation *op
)
{
- char *dn = NULL, *ndn=NULL;
- struct berval desc;
- struct berval value;
- struct berval *nvalue;
- AttributeAssertion ava;
+ Entry *entry = NULL;
+ struct berval dn = { 0, NULL };
+ struct berval pdn = { 0, NULL };
+ struct berval ndn = { 0, NULL };
+ struct berval desc = { 0, NULL };
+ struct berval value = { 0, NULL };
+ AttributeAssertion ava = { 0 };
Backend *be;
int rc = LDAP_SUCCESS;
const char *text = NULL;
int manageDSAit;
ava.aa_desc = NULL;
- desc.bv_val = NULL;
- value.bv_val = NULL;
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
- "do_compare: conn %d\n", conn->c_connid ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+ "do_compare: conn %d\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
#endif
* }
*/
- if ( ber_scanf( op->o_ber, "{a" /*}*/, &dn ) == LBER_ERROR ) {
+ if ( ber_scanf( op->o_ber, "{m" /*}*/, &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
#endif
return SLAPD_DISCONNECT;
}
- if ( ber_scanf( op->o_ber, "{oo}", &desc, &value ) == LBER_ERROR ) {
+ if ( ber_scanf( op->o_ber, "{mm}", &desc, &value ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_compare: conn %d get ava failed\n", conn->c_connid ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_compare: conn %d get ava failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_compare: get ava failed\n", 0, 0, 0 );
#endif
if ( ber_scanf( op->o_ber, /*{*/ "}" ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
- "do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+ "do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
#endif
if( ( rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "do_compare: conn %d get_ctrls failed\n", conn->c_connid ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_compare: conn %d get_ctrls failed\n", conn->c_connid ));
#else
Debug( LDAP_DEBUG_ANY, "do_compare: get_ctrls failed\n", 0, 0, 0 );
#endif
goto cleanup;
}
- ndn = ch_strdup( dn );
-
- if( dn_normalize( ndn ) == NULL ) {
+ rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
+ if( rc != LDAP_SUCCESS ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
- "do_compare: conn %d invalid dn (%s)\n",
- conn->c_connid, dn ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+ "do_compare: conn %d invalid dn (%s)\n",
+ conn->c_connid, dn.bv_val ));
#else
- Debug( LDAP_DEBUG_ANY, "do_compare: invalid dn (%s)\n", dn, 0, 0 );
+ Debug( LDAP_DEBUG_ANY,
+ "do_compare: invalid dn (%s)\n", dn.bv_val, 0, 0 );
#endif
send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
"invalid DN", NULL, NULL );
goto cleanup;
}
- if( ndn == '\0' ) {
+ rc = slap_bv2ad( &desc, &ava.aa_desc, &text );
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
+ goto cleanup;
+ }
+
+ 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;
+ }
+
+ if( strcasecmp( ndn.bv_val, LDAP_ROOT_DSE ) == 0 ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
- "do_compare: conn %d compare to root DSE!\n",
- conn->c_connid ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+ "do_compare: conn %d dn (%s) attr(%s) value (%s)\n",
+ conn->c_connid, pdn.bv_val,
+ ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ));
#else
- Debug( LDAP_DEBUG_ANY, "do_compare: root dse!\n", 0, 0, 0 );
+ Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n",
+ pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val );
#endif
- send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "compare upon the root DSE not supported", NULL, NULL );
+
+ 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 );
+
+ rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ;
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
+ goto cleanup;
+ }
+
+ rc = root_dse_info( conn, &entry, &text );
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
+ goto cleanup;
+ }
+
+ } else if ( strcasecmp( ndn.bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+ "do_compare: conn %d dn (%s) attr(%s) value (%s)\n",
+ conn->c_connid, pdn.bv_val, ava.aa_desc->ad_cname.bv_val,
+ ava.aa_value.bv_val ));
+#else
+ Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n",
+ pdn.bv_val, ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val );
+#endif
+
+ 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 );
+
+ rc = backend_check_restrictions( NULL, conn, op, NULL, &text ) ;
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
+ rc = 0;
+ goto cleanup;
+ }
+
+ rc = schema_info( &entry, &text );
+ if( rc != LDAP_SUCCESS ) {
+ send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
+ rc = 0;
+ goto cleanup;
+ }
+ }
+
+ if( entry ) {
+ rc = compare_entry( conn, op, entry, &ava );
+ entry_free( entry );
+
+ send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
+
+ if( rc == LDAP_COMPARE_TRUE || rc == LDAP_COMPARE_FALSE ) {
+ rc = 0;
+ }
+
goto cleanup;
}
* appropriate one, or send a referral to our "referral server"
* if we don't hold it.
*/
- if ( (be = select_backend( ndn, manageDSAit )) == NULL ) {
+ if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
+ BerVarray ref = referral_rewrite( default_referral,
+ NULL, &pdn, LDAP_SCOPE_DEFAULT );
+
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
- NULL, NULL, default_referral, NULL );
- rc = 1;
+ NULL, NULL, ref ? ref : default_referral, NULL );
+
+ ber_bvarray_free( ref );
+ rc = 0;
goto cleanup;
}
}
/* check for referrals */
- rc = backend_check_referrals( be, conn, op, dn, ndn );
+ rc = backend_check_referrals( be, conn, op, &pdn, &ndn );
if ( rc != LDAP_SUCCESS ) {
goto cleanup;
}
- rc = slap_bv2ad( &desc, &ava.aa_desc, &text );
- if( rc != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, rc, NULL,
- text, NULL, NULL );
- goto cleanup;
- }
-
- if( !ava.aa_desc->ad_type->sat_equality ) {
- /* no equality matching rule */
- send_ldap_result( conn, op, rc = LDAP_INAPPROPRIATE_MATCHING, NULL,
- "no equality matching rule defined", NULL, NULL );
- goto cleanup;
- }
-
- rc = value_normalize( ava.aa_desc, SLAP_MR_EQUALITY, &value, &nvalue, &text );
-
- if( rc != LDAP_SUCCESS ) {
- send_ldap_result( conn, op, rc, NULL,
- text, NULL, NULL );
- goto cleanup;
- }
-
- ava.aa_value = nvalue;
-
#ifdef NEW_LOGGING
- LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
- "do_compare: conn %d dn (%s) attr(%s) value (%s)\n",
- conn->c_connid, dn, ava.aa_desc->ad_cname->bv_val,
- ava.aa_value->bv_val ));
+ LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+ "do_compare: conn %d dn (%s) attr(%s) value (%s)\n",
+ conn->c_connid, pdn.bv_val, ava.aa_desc->ad_cname.bv_val,
+ ava.aa_value.bv_val ));
#else
Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n",
- dn, ava.aa_desc->ad_cname->bv_val, ava.aa_value->bv_val );
+ 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",
- op->o_connid, op->o_opid, dn, ava.aa_desc->ad_cname->bv_val, 0 );
+ 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 );
/* deref suffix alias if appropriate */
- ndn = suffix_alias( be, ndn );
+ suffix_alias( be, &ndn );
if ( be->be_compare ) {
- (*be->be_compare)( be, conn, op, dn, ndn, &ava );
+ (*be->be_compare)( be, conn, op, &pdn, &ndn, &ava );
} else {
send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
- NULL, "operation not supported within namingContext", NULL, NULL );
+ NULL, "operation not supported within namingContext",
+ NULL, NULL );
}
cleanup:
- free( dn );
- free( ndn );
- free( desc.bv_val );
- free( value.bv_val );
- if( ava.aa_desc != NULL ) {
- ad_free( ava.aa_desc, 1 );
+ free( pdn.bv_val );
+ free( ndn.bv_val );
+ if ( ava.aa_value.bv_val ) free( ava.aa_value.bv_val );
+
+ return rc;
+}
+
+static int compare_entry(
+ Connection *conn,
+ Operation *op,
+ Entry *e,
+ AttributeAssertion *ava )
+{
+ int rc = LDAP_NO_SUCH_ATTRIBUTE;
+ Attribute *a;
+
+ if ( ! access_allowed( NULL, conn, op, e,
+ ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL ) )
+ {
+ return LDAP_INSUFFICIENT_ACCESS;
+ }
+
+ 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;
+ }
}
return rc;