Use "uri" directive (instead of "server") to specify server. Add "bin

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index 1fbd5d3e38c1a465412d52ece078cdbb8581da36..c25958b01b044ecce24824b97a741dddad2c2b3b 100644 (file)
--- 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
  */
 /*
@@ -33,17 +33,15 @@ do_compare(
        char    *dn = NULL, *ndn=NULL;
        struct berval desc;
        struct berval value;
-       Backend *be;
-       int rc = LDAP_SUCCESS;
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
-       char *text = NULL;
+       struct berval *nvalue;
        AttributeAssertion ava;
-
-       ava.aa_desc = NULL;
 #else
        Ava     ava;
 #endif
-       char *text;
+       Backend *be;
+       int rc = LDAP_SUCCESS;
+       const char *text = NULL;
 
        desc.bv_val = NULL;
        value.bv_val = NULL;
@@ -100,13 +98,30 @@ do_compare(
        }
 
 #ifdef SLAPD_SCHEMA_NOT_COMPAT
+       ava.aa_desc = NULL;
        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;
+
+       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, ava.aa_value->bv_val );
@@ -156,7 +171,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: