X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcompare.c;h=230602895a597849c61e6b39106d69634bd71e2e;hb=5ed0fc37494b835aeeb39bd55ee6d71cedad8143;hp=d43af1c0164130907484859a7659e3c39a5e40a7;hpb=d2af85fd08dd26964acb7bb8f040fe35bd7bbd17;p=openldap
diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index d43af1c016..230602895a 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,7 +1,7 @@
/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software .
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2007 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@ -30,9 +30,6 @@
#include
#include "slap.h"
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-#endif
static int compare_entry(
Operation *op,
@@ -102,8 +99,13 @@ do_compare(
rs->sr_err = slap_bv2ad( &desc, &ava.aa_desc, &rs->sr_text );
if( rs->sr_err != LDAP_SUCCESS ) {
- send_ldap_result( op, rs );
- goto cleanup;
+ rs->sr_err = slap_bv2undef_ad( &desc, &ava.aa_desc,
+ &rs->sr_text,
+ SLAP_AD_PROXIED|SLAP_AD_NOINSERT );
+ if( rs->sr_err != LDAP_SUCCESS ) {
+ send_ldap_result( op, rs );
+ goto cleanup;
+ }
}
rs->sr_err = asserted_value_validate_normalize( ava.aa_desc,
@@ -123,7 +125,7 @@ do_compare(
cleanup:;
op->o_tmpfree( op->o_req_dn.bv_val, op->o_tmpmemctx );
op->o_tmpfree( op->o_req_ndn.bv_val, op->o_tmpmemctx );
- if ( ava.aa_value.bv_val ) {
+ if ( !BER_BVISNULL( &ava.aa_value ) ) {
op->o_tmpfree( ava.aa_value.bv_val, op->o_tmpmemctx );
}
@@ -133,9 +135,10 @@ cleanup:;
int
fe_op_compare( Operation *op, SlapReply *rs )
{
- Entry *entry = NULL;
- int manageDSAit;
- AttributeAssertion ava = *op->orc_ava;
+ Entry *entry = NULL;
+ int manageDSAit;
+ AttributeAssertion ava = *op->orc_ava;
+ BackendDB *bd = op->o_bd;
if( strcasecmp( op->o_req_ndn.bv_val, LDAP_ROOT_DSE ) == 0 ) {
Debug( LDAP_DEBUG_ARGS,
@@ -212,9 +215,8 @@ fe_op_compare( Operation *op, SlapReply *rs )
rs->sr_err = LDAP_REFERRAL;
if (!rs->sr_ref) rs->sr_ref = default_referral;
- op->o_bd = frontendDB;
+ op->o_bd = bd;
send_ldap_result( op, rs );
- op->o_bd = NULL;
if (rs->sr_ref != default_referral) ber_bvarray_free( rs->sr_ref );
rs->sr_err = 0;
@@ -240,37 +242,14 @@ fe_op_compare( Operation *op, SlapReply *rs )
op->o_log_prefix, op->o_req_dn.bv_val,
ava.aa_desc->ad_cname.bv_val, 0, 0 );
-#if defined( LDAP_SLAPI )
-#define pb op->o_pb
- if ( pb ) {
- slapi_int_pblock_set_operation( pb, op );
- slapi_pblock_set( pb, SLAPI_COMPARE_TARGET, (void *)op->o_req_dn.bv_val );
- slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
- slapi_pblock_set( pb, SLAPI_COMPARE_TYPE, (void *)ava.aa_desc->ad_cname.bv_val );
- slapi_pblock_set( pb, SLAPI_COMPARE_VALUE, (void *)&ava.aa_value );
-
- rs->sr_err = slapi_int_call_plugins( op->o_bd,
- SLAPI_PLUGIN_PRE_COMPARE_FN, pb );
- if ( rs->sr_err < 0 ) {
- /*
- * A preoperation plugin failure will abort the
- * entire operation.
- */
- Debug(LDAP_DEBUG_TRACE,
- "do_compare: compare preoperation plugin failed\n",
- 0, 0, 0);
- if ( ( slapi_pblock_get( op->o_pb, SLAPI_RESULT_CODE,
- (void *)&rs->sr_err ) != 0 ) || rs->sr_err == LDAP_SUCCESS )
- {
- rs->sr_err = LDAP_OTHER;
- }
- goto cleanup;
- }
- }
-#endif /* defined( LDAP_SLAPI ) */
-
op->orc_ava = &ava;
- if ( ava.aa_desc == slap_schema.si_ad_entryDN ) {
+
+ if ( SLAP_SHADOW(op->o_bd) && get_dontUseCopy(op) ) {
+ /* don't use shadow copy */
+ send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
+ "copy not used" );
+
+ } else if ( ava.aa_desc == slap_schema.si_ad_entryDN ) {
send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
"entryDN compare not supported" );
@@ -311,7 +290,6 @@ fe_op_compare( Operation *op, SlapReply *rs )
}
} else {
-#ifdef SLAP_ACL_HONOR_DISCLOSE
/* return error only if "disclose"
* is granted on the object */
if ( backend_access( op, NULL, &op->o_req_ndn,
@@ -320,7 +298,6 @@ fe_op_compare( Operation *op, SlapReply *rs )
{
rs->sr_err = LDAP_NO_SUCH_OBJECT;
}
-#endif /* SLAP_ACL_HONOR_DISCLOSE */
}
send_ldap_result( op, rs );
@@ -355,7 +332,6 @@ fe_op_compare( Operation *op, SlapReply *rs )
ava.aa_desc, &vals, ACL_COMPARE );
switch ( rs->sr_err ) {
default:
-#ifdef SLAP_ACL_HONOR_DISCLOSE
/* return error only if "disclose"
* is granted on the object */
if ( backend_access( op, NULL, &op->o_req_ndn,
@@ -365,7 +341,6 @@ fe_op_compare( Operation *op, SlapReply *rs )
{
rs->sr_err = LDAP_NO_SUCH_OBJECT;
}
-#endif /* SLAP_ACL_HONOR_DISCLOSE */
break;
case LDAP_SUCCESS:
@@ -395,16 +370,8 @@ fe_op_compare( Operation *op, SlapReply *rs )
}
}
-#if defined( LDAP_SLAPI )
- if ( pb != NULL && slapi_int_call_plugins( op->o_bd,
- SLAPI_PLUGIN_POST_COMPARE_FN, pb ) < 0 )
- {
- Debug(LDAP_DEBUG_TRACE,
- "do_compare: compare postoperation plugins failed\n", 0, 0, 0 );
- }
-#endif /* defined( LDAP_SLAPI ) */
-
cleanup:;
+ op->o_bd = bd;
return rs->sr_err;
}
@@ -451,7 +418,6 @@ static int compare_entry(
}
done:
-#ifdef LDAP_ACL_HONOR_DISCLOSE
if( rc != LDAP_COMPARE_TRUE && rc != LDAP_COMPARE_FALSE ) {
if ( ! access_allowed( op, e,
slap_schema.si_ad_entry, NULL, ACL_DISCLOSE, NULL ) )
@@ -459,7 +425,6 @@ done:
rc = LDAP_NO_SUCH_OBJECT;
}
}
-#endif
return rc;
}