X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fcompare.c;h=b8c93fc132ebc05a13eff6ced07f86349cb7fbb3;hb=ae63be3894c799771d0ccabec1e376c7478cd263;hp=259698bc46e623dda92d377bfa1c8e7a87ebbb1f;hpb=e96865c1a813a4dd227edd9d95c900d0128c0dde;p=openldap

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 259698bc46..b8c93fc132 100644
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -18,7 +18,6 @@
 #include "portable.h"
 
 #include <stdio.h>
-
 #include <ac/socket.h>
 
 #include "ldap_pvt.h"
@@ -33,30 +32,18 @@ do_compare(
 	char	*dn = NULL, *ndn=NULL;
 	struct berval desc;
 	struct berval value;
+	struct berval *nvalue;
+	AttributeAssertion ava;
 	Backend	*be;
 	int rc = LDAP_SUCCESS;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	char *text = NULL;
-	AttributeAssertion ava;
+	const char *text = NULL;
 
 	ava.aa_desc = NULL;
-#else
-	Ava	ava;
-#endif
-
 	desc.bv_val = NULL;
 	value.bv_val = NULL;
 
 	Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
 
-	if( op->o_bind_in_progress ) {
-		Debug( LDAP_DEBUG_ANY, "do_compare: SASL bind in progress.\n",
-			0, 0, 0 );
-		send_ldap_result( conn, op, LDAP_SASL_BIND_IN_PROGRESS,
-			NULL, "SASL bind in progress", NULL, NULL );
-		return LDAP_SASL_BIND_IN_PROGRESS;
-	}
-
 	/*
 	 * Parse the compare request.  It looks like this:
 	 *
@@ -106,35 +93,6 @@ do_compare(
 		goto cleanup;
 	}
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-	rc = slap_bv2ad( &desc, &ava.aa_desc, &text );
-	if( rc != LDAP_SUCCESS ) {
-		send_ldap_result( conn, op, rc, NULL,
-		    text, NULL, NULL );
-		goto cleanup;
-	}
-	ava.aa_value = &value;
-
-	Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n",
-	    dn, ava.aa_desc->ad_cname, ava.aa_value->bv_val );
-
-	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, 0 );
-
-#else
-	ava.ava_type = desc.bv_val;
-	ava.ava_value = value;
-	attr_normalize( ava.ava_type );
-	value_normalize( ava.ava_value.bv_val, attr_syntax( ava.ava_type ) );
-
-	Debug( LDAP_DEBUG_ARGS, "do_compare: dn (%s) attr (%s) value (%s)\n",
-	    dn, ava.ava_type, ava.ava_value.bv_val );
-
-	Statslog( LDAP_DEBUG_STATS, "conn=%ld op=%d CMP dn=\"%s\" attr=\"%s\"\n",
-	    op->o_connid, op->o_opid, dn, ava.ava_type, 0 );
-#endif
-
-
 	/*
 	 * We could be serving multiple database backends.  Select the
 	 * appropriate one, or send a referral to our "referral server"
@@ -148,14 +106,50 @@ do_compare(
 	}
 
 	/* make sure this backend recongizes critical controls */
-	rc = backend_check_controls( be, conn, op ) ;
-
+	rc = backend_check_controls( be, conn, op, &text ) ;
 	if( rc != LDAP_SUCCESS ) {
 		send_ldap_result( conn, op, rc,
-			NULL, NULL, NULL, NULL );
+			NULL, text, NULL, NULL );
+		goto cleanup;
+	}
+
+	/* check for referrals */
+	rc = backend_check_referrals( be, conn, op, dn, ndn );
+	if ( rc != LDAP_SUCCESS ) {
 		goto cleanup;
 	}
 
+	rc = slap_bv2ad( &desc, &ava.aa_desc, &text );
+	if( rc != LDAP_SUCCESS ) {
+		send_ldap_result( conn, op, rc, NULL,
+		    text, NULL, NULL );
+		goto cleanup;
+	}
+
+	if( !ava.aa_desc->ad_type->sat_equality ) {
+		/* no equality matching rule */
+		send_ldap_result( conn, op, rc = LDAP_INAPPROPRIATE_MATCHING, NULL,
+		    "no equality matching rule defined", NULL, NULL );
+		goto cleanup;
+	}
+
+	rc = value_normalize( ava.aa_desc, SLAP_MR_EQUALITY, &value, &nvalue, &text );
+
+	if( rc != LDAP_SUCCESS ) {
+		send_ldap_result( conn, op, rc, NULL,
+		    text, NULL, NULL );
+		goto cleanup;
+	}
+
+	ava.aa_value = nvalue;
+
+	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 );
+
+	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 );
+
+
 	/* deref suffix alias if appropriate */
 	ndn = suffix_alias( be, ndn );
 
@@ -163,7 +157,7 @@ do_compare(
 		(*be->be_compare)( be, conn, op, dn, ndn, &ava );
 	} else {
 		send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
-			NULL, "Function not implemented", NULL, NULL );
+			NULL, "operation not supported within namingContext", NULL, NULL );
 	}
 
 cleanup:
@@ -171,11 +165,9 @@ cleanup:
 	free( ndn );
 	free( desc.bv_val );
 	free( value.bv_val );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 	if( ava.aa_desc != NULL ) {
 		ad_free( ava.aa_desc, 1 );
 	}
-#endif
 
 	return rc;
 }