X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcompare.c;h=81e3e9f54e206783b54226bbe957f3b67fe4b4fa;hb=416aeb9347609866126a71de112afdefdff829bf;hp=2f4f03f6aed3f49bff2dbe7188fa4c08dec2c4fa;hpb=82fad7d0c81c062f00337536db3cb89749000bcc;p=openldap

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 2f4f03f6ae..81e3e9f54e 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,6 +1,6 @@
 /* $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
  */
 /*
@@ -36,24 +36,22 @@ do_compare(
 )
 {
 	Entry *entry = NULL;
-	Attribute	*a = NULL;
-	char	*dn = NULL, *ndn=NULL;
-	struct berval desc;
-	struct berval value;
-	struct berval *nvalue;
-	AttributeAssertion ava;
+	Entry *fentry = 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, ENTRY, "do_compare: conn %d\n", conn->c_connid, 0, 0 );
 #else
 	Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
 #endif
@@ -69,10 +67,10 @@ do_compare(
 	 *	}
 	 */
 
-	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, ERR, 
+			"do_compare: conn %d  ber_scanf failed\n", conn->c_connid, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -81,10 +79,10 @@ do_compare(
 		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, ERR, 
+			"do_compare: conn %d  get ava failed\n", conn->c_connid, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "do_compare: get ava failed\n", 0, 0, 0 );
 #endif
@@ -96,8 +94,8 @@ do_compare(
 
 	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, ERR, 
+			"do_compare: conn %d  ber_scanf failed\n", conn->c_connid, 0, 0 );
 #else
 		Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -109,23 +107,23 @@ do_compare(
 
 	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, INFO, 
+			"do_compare: conn %d  get_ctrls failed\n", conn->c_connid, 0, 0 );
 #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, INFO, 
+			"do_compare: conn %d  invalid dn (%s)\n",
+			conn->c_connid, dn.bv_val, 0 );
 #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 );
@@ -135,31 +133,30 @@ do_compare(
 	rc = slap_bv2ad( &desc, &ava.aa_desc, &text );
 	if( rc != LDAP_SUCCESS ) {
 		send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
-		return rc;
+		goto cleanup;
 	}
 
-	rc = value_normalize( ava.aa_desc, SLAP_MR_EQUALITY, &value, &nvalue, &text );
+	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 );
-		return rc;
+		goto cleanup;
 	}
 
-	ava.aa_value = nvalue;
-
-	if( strcasecmp( ndn, LDAP_ROOT_DSE ) == 0 ) {
+	if( strcasecmp( ndn.bv_val, LDAP_ROOT_DSE ) == 0 ) {
 #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, 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 );
 #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 );
+			"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 ) {
@@ -173,20 +170,23 @@ do_compare(
 			goto cleanup;
 		}
 
-	} else if ( strcasecmp( ndn, SLAPD_SCHEMA_DN ) == 0 ) {
+		fentry = entry;
+
+	} else if ( bvmatch( &ndn, &global_schemandn ) ) {
 #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, 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 );
 #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 );
+			"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 ) {
@@ -201,11 +201,12 @@ do_compare(
 			rc = 0;
 			goto cleanup;
 		}
+		fentry = entry;
 	}
 
 	if( entry ) {
 		rc = compare_entry( conn, op, entry, &ava );
-		entry_free( entry );
+		if( fentry) entry_free( fentry );
 
 		send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
 
@@ -223,14 +224,14 @@ do_compare(
 	 * appropriate one, or send a referral to our "referral server"
 	 * if we don't hold it.
 	 */
-	if ( (be = select_backend( ndn, manageDSAit )) == NULL ) {
-		struct berval **ref = referral_rewrite( default_referral,
-			NULL, dn, LDAP_SCOPE_DEFAULT );
+	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, ref ? ref : default_referral, NULL );
 
-		ber_bvecfree( ref );
+		ber_bvarray_free( ref );
 		rc = 0;
 		goto cleanup;
 	}
@@ -244,40 +245,40 @@ do_compare(
 	}
 
 	/* 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;
 	}
 
 #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, 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 );
 #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 );
+	free( pdn.bv_val );
+	free( ndn.bv_val );
+	if ( ava.aa_value.bv_val ) free( ava.aa_value.bv_val );
 
 	return rc;
 }
@@ -292,7 +293,7 @@ static int compare_entry(
 	Attribute *a;
 
 	if ( ! access_allowed( NULL, conn, op, e,
-		ava->aa_desc, ava->aa_value, ACL_COMPARE ) )
+		ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL ) )
 	{	
 		return LDAP_INSUFFICIENT_ACCESS;
 	}
@@ -303,10 +304,7 @@ static int compare_entry(
 	{
 		rc = LDAP_COMPARE_FALSE;
 
-		if ( value_find_ex( ava->aa_desc,
-			SLAP_MR_VALUE_IS_IN_MR_SYNTAX,
-			a->a_vals, ava->aa_value ) == 0 )
-		{
+		if ( value_find( ava->aa_desc, a->a_vals, &ava->aa_value ) == 0 ) {
 			rc = LDAP_COMPARE_TRUE;
 			break;
 		}