X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;ds=sidebyside;f=servers%2Fslapd%2Fcompare.c;h=fdfccea5193fe8ad345aee050ae58846b595ac8a;hb=1586a68219cf85e9caaafcf2259c9bc249358077;hp=f0e38860f7ff41166c7f2330d3e4ff3f35ef88c8;hpb=fa9bf235011d7f8250f243060afa2d3d3af3c9f6;p=openldap

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index f0e38860f7..fdfccea519 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,10 +1,18 @@
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
-/*
- * Copyright (c) 1995 Regents of the University of Michigan.
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms are permitted
@@ -19,6 +27,7 @@
 
 #include <stdio.h>
 #include <ac/socket.h>
+#include <ac/string.h>
 
 #include "ldap_pvt.h"
 #include "slap.h"
@@ -44,10 +53,6 @@ do_compare(
 	AttributeAssertion ava = { NULL, { 0, NULL } };
 	int manageDSAit;
 
-#ifdef LDAP_SLAPI
-	Slapi_PBlock *pb = op->o_pb;
-#endif
-
 	ava.aa_desc = NULL;
 
 #ifdef NEW_LOGGING
@@ -110,7 +115,7 @@ do_compare(
 		goto cleanup;
 	} 
 
-	rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn );
+	rs->sr_err = dnPrettyNormal( NULL, &dn, &op->o_req_dn, &op->o_req_ndn, op->o_tmpmemctx );
 	if( rs->sr_err != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, INFO, 
@@ -130,15 +135,10 @@ do_compare(
 		goto cleanup;
 	}
 
-#ifdef SLAP_NVALUES
 	rs->sr_err = asserted_value_validate_normalize( ava.aa_desc,
 		ava.aa_desc->ad_type->sat_equality,
 		SLAP_MR_EQUALITY|SLAP_MR_VALUE_OF_ASSERTION_SYNTAX,
-		&value, &ava.aa_value, &rs->sr_text );
-#else
-	rs->sr_err = value_validate_normalize( ava.aa_desc, SLAP_MR_EQUALITY,
-		&value, &ava.aa_value, &rs->sr_text );
-#endif
+		&value, &ava.aa_value, &rs->sr_text, op->o_tmpmemctx );
 	if( rs->sr_err != LDAP_SUCCESS ) {
 		send_ldap_result( op, rs );
 		goto cleanup;
@@ -258,28 +258,33 @@ do_compare(
 		ava.aa_desc->ad_cname.bv_val, 0 );
 
 #if defined( LDAP_SLAPI )
-	slapi_x_pblock_set_operation( pb, op );
-	slapi_pblock_set( pb, SLAPI_COMPARE_TARGET, (void *)dn.bv_val );
-	slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
-	slapi_pblock_set( pb, SLAPI_COMPARE_TYPE, (void *)desc.bv_val );
-	slapi_pblock_set( pb, SLAPI_COMPARE_VALUE, (void *)&value );
-
-	rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_COMPARE_FN, pb );
-	if ( rs->sr_err != 0 ) {
-		/*
-		 * A preoperation plugin failure will abort the
-		 * entire operation.
-		 */
+#define	pb	op->o_pb
+	if ( pb ) {
+		slapi_int_pblock_set_operation( pb, op );
+		slapi_pblock_set( pb, SLAPI_COMPARE_TARGET, (void *)dn.bv_val );
+		slapi_pblock_set( pb, SLAPI_MANAGEDSAIT, (void *)manageDSAit );
+		slapi_pblock_set( pb, SLAPI_COMPARE_TYPE, (void *)desc.bv_val );
+		slapi_pblock_set( pb, SLAPI_COMPARE_VALUE, (void *)&value );
+
+		rs->sr_err = doPluginFNs( op->o_bd, SLAPI_PLUGIN_PRE_COMPARE_FN, pb );
+		if ( rs->sr_err < 0 ) {
+			/*
+			 * A preoperation plugin failure will abort the
+			 * entire operation.
+			 */
 #ifdef NEW_LOGGING
-		LDAP_LOG( OPERATION, INFO, "do_compare: compare preoperation plugin "
-				"failed\n", 0, 0, 0);
+			LDAP_LOG( OPERATION, INFO, "do_compare: compare preoperation plugin "
+					"failed\n", 0, 0, 0);
 #else
-		Debug(LDAP_DEBUG_TRACE, "do_compare: compare preoperation plugin "
-				"failed.\n", 0, 0, 0);
+			Debug(LDAP_DEBUG_TRACE, "do_compare: compare preoperation plugin "
+					"failed.\n", 0, 0, 0);
 #endif
-		if ( slapi_pblock_get( pb, SLAPI_RESULT_CODE, (void *)&rs->sr_err ) != 0)
-			rs->sr_err = LDAP_OTHER;
-		goto cleanup;
+			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 ) */
 
@@ -292,7 +297,7 @@ do_compare(
 	}
 
 #if defined( LDAP_SLAPI )
-	if ( doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_COMPARE_FN, pb ) != 0 ) {
+	if ( pb && doPluginFNs( op->o_bd, SLAPI_PLUGIN_POST_COMPARE_FN, pb ) < 0 ) {
 #ifdef NEW_LOGGING
 		LDAP_LOG( OPERATION, INFO, "do_compare: compare postoperation plugins "
 				"failed\n", 0, 0, 0 );
@@ -304,9 +309,9 @@ do_compare(
 #endif /* defined( LDAP_SLAPI ) */
 
 cleanup:
-	free( op->o_req_dn.bv_val );
-	free( op->o_req_ndn.bv_val );
-	if ( ava.aa_value.bv_val ) free( ava.aa_value.bv_val );
+	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 ) op->o_tmpfree( ava.aa_value.bv_val, op->o_tmpmemctx );
 
 	return rs->sr_err;
 }
@@ -331,15 +336,11 @@ static int compare_entry(
 	{
 		rc = LDAP_COMPARE_FALSE;
 
-#ifdef SLAP_NVALUES
 		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 ) == 0 )
-#else
-		if ( value_find( ava->aa_desc, a->a_vals, &ava->aa_value ) == 0 )
-#endif
+			&ava->aa_value, op->o_tmpmemctx ) == 0 )
 		{
 			rc = LDAP_COMPARE_TRUE;
 			break;