use slab memory for proxyauthz

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index d43af1c0164130907484859a7659e3c39a5e40a7..2dd0b169eb90d7fc91ffa3060a191ec0dbeecbea 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,
@@ -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 );
        }
 
@@ -240,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,
@@ -395,15 +368,6 @@ 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:;
        return rs->sr_err;
 }