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 89bf6a0a1b05cf0a5f71ca756bb7de2d754e4fbc..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
  */
 /*
@@ -31,19 +31,22 @@ do_compare(
 )
 {
        char    *dn = NULL, *ndn=NULL;
+       struct berval desc;
+       struct berval value;
+#ifdef SLAPD_SCHEMA_NOT_COMPAT
+       struct berval *nvalue;
+       AttributeAssertion ava;
+#else
        Ava     ava;
+#endif
        Backend *be;
        int rc = LDAP_SUCCESS;
+       const char *text = NULL;
 
-       Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
+       desc.bv_val = NULL;
+       value.bv_val = NULL;
 
-       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;
-       }
+       Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
 
        /*
         * Parse the compare request.  It looks like this:
@@ -61,30 +64,23 @@ do_compare(
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
-       }
-
-       ndn = ch_strdup( dn );
-
-       if( dn_normalize( ndn ) == NULL ) {
-               Debug( LDAP_DEBUG_ANY, "do_compare: invalid dn (%s)\n", dn, 0, 0 );
-               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
-                   "invalid DN", NULL, NULL );
-               goto cleanup;
+               return SLAPD_DISCONNECT;
        }
 
-       if ( get_ava( op->o_ber, &ava ) != LDAP_SUCCESS ) {
+       if ( ber_scanf( op->o_ber, "{oo}", &desc, &value ) == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "do_compare: get ava failed\n", 0, 0, 0 );
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
+               rc = SLAPD_DISCONNECT;
+               goto cleanup;
        }
 
        if ( ber_scanf( op->o_ber, /*{*/ "}" ) == LBER_ERROR ) {
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
-               return -1;
+               rc = SLAPD_DISCONNECT;
+               goto cleanup;
        }
 
        if( ( rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
@@ -92,11 +88,60 @@ do_compare(
                goto cleanup;
        } 
 
+       ndn = ch_strdup( dn );
+
+       if( dn_normalize( ndn ) == NULL ) {
+               Debug( LDAP_DEBUG_ANY, "do_compare: invalid dn (%s)\n", dn, 0, 0 );
+               send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
+                   "invalid DN", NULL, NULL );
+               goto cleanup;
+       }
+
+#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;
+       }
+
+       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 );
+
+       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
@@ -111,11 +156,12 @@ 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;
        }
 
        /* deref suffix alias if appropriate */
@@ -125,13 +171,19 @@ 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:
        free( dn );
        free( ndn );
-       ava_free( &ava, 0 );
+       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;
 }