seems to fix the equivalent of ITS#4429 in back-meta; had to give up per-target conn...

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 3541118d033c86cd8da46b0b8ddfd0d0267a2db2..bbe9774e1dd6f2526cf1c5afbdab10ab06059bfb 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,7 +1,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -30,9 +30,6 @@
 #include <ac/string.h>
 
 #include "slap.h"
-#ifdef LDAP_SLAPI
-#include "slapi/slapi.h"
-#endif
 
 static int compare_entry(
        Operation *op,
@@ -47,7 +44,11 @@ do_compare(
        struct berval dn = BER_BVNULL;
        struct berval desc = BER_BVNULL;
        struct berval value = BER_BVNULL;
+#ifdef LDAP_COMP_MATCH
+       AttributeAssertion ava = { NULL, BER_BVNULL, NULL };
+#else
        AttributeAssertion ava = { NULL, BER_BVNULL };
+#endif
 
        ava.aa_desc = NULL;
 
@@ -98,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,
@@ -119,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 );
        }
 
@@ -129,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,
@@ -208,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;
@@ -236,35 +242,6 @@ 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 ) {
                send_ldap_error( op, rs, LDAP_UNWILLING_TO_PERFORM,
@@ -391,16 +368,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;
 }
 
@@ -409,19 +378,22 @@ static int compare_entry(
        Entry *e,
        AttributeAssertion *ava )
 {
-       int rc;
+       int rc = LDAP_COMPARE_FALSE;
        Attribute *a;
 
        if ( ! access_allowed( op, e,
                ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL ) )
        {       
-               return LDAP_INSUFFICIENT_ACCESS;
+               rc = LDAP_INSUFFICIENT_ACCESS;
+               goto done;
        }
 
        a = attrs_find( e->e_attrs, ava->aa_desc );
-       if( a == NULL ) return LDAP_NO_SUCH_ATTRIBUTE;
+       if( a == NULL ) {
+               rc = LDAP_NO_SUCH_ATTRIBUTE;
+               goto done;
+       }
 
-       rc = LDAP_COMPARE_FALSE;
        for(a = attrs_find( e->e_attrs, ava->aa_desc );
                a != NULL;
                a = attrs_find( a->a_next, ava->aa_desc ))
@@ -436,13 +408,23 @@ static int compare_entry(
                if ( value_find_ex( ava->aa_desc,
                        SLAP_MR_ATTRIBUTE_VALUE_NORMALIZED_MATCH |
                                SLAP_MR_ASSERTED_VALUE_NORMALIZED_MATCH,
-                       a->a_nvals,
-                       &ava->aa_value, op->o_tmpmemctx ) == 0 )
+                       a->a_nvals, &ava->aa_value, op->o_tmpmemctx ) == 0 )
                {
                        rc = LDAP_COMPARE_TRUE;
                        break;
                }
        }
 
+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 ) )
+               {
+                       rc = LDAP_NO_SUCH_OBJECT;
+               }
+       }
+#endif
+
        return rc;
 }