DirectoryString syntaxes must have one or more octets to be valid.

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index fa995945264db39b48dac2cd3be5aa1153c5c90d..b8c93fc132ebc05a13eff6ced07f86349cb7fbb3 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -18,7 +18,6 @@
 #include "portable.h"
 
 #include <stdio.h>
-
 #include <ac/socket.h>
 
 #include "ldap_pvt.h"
@@ -33,16 +32,13 @@ 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;
-       char *text = NULL;
+       const char *text = NULL;
 
+       ava.aa_desc = NULL;
        desc.bv_val = NULL;
        value.bv_val = NULL;
 
@@ -97,8 +93,32 @@ do_compare(
                goto cleanup;
        }
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
-       ava.aa_desc = NULL;
+       /*
+        * We could be serving multiple database backends.  Select the
+        * appropriate one, or send a referral to our "referral server"
+        * if we don't hold it.
+        */
+       if ( (be = select_backend( ndn )) == NULL ) {
+               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+                       NULL, NULL, default_referral, NULL );
+               rc = 1;
+               goto cleanup;
+       }
+
+       /* make sure this backend recongizes critical controls */
+       rc = backend_check_controls( be, conn, op, &text ) ;
+       if( rc != LDAP_SUCCESS ) {
+               send_ldap_result( conn, op, rc,
+                       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,
@@ -124,45 +144,11 @@ do_compare(
        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 );
+           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, 0 );
+           op->o_connid, op->o_opid, dn, ava.aa_desc->ad_cname->bv_val, 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"
-        * if we don't hold it.
-        */
-       if ( (be = select_backend( ndn )) == NULL ) {
-               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
-                       NULL, NULL, default_referral, NULL );
-               rc = 1;
-               goto cleanup;
-       }
-
-       /* make sure this backend recongizes critical controls */
-       rc = backend_check_controls( be, conn, op, &text ) ;
-
-       if( rc != LDAP_SUCCESS ) {
-               send_ldap_result( conn, op, rc,
-                       NULL, text, NULL, NULL );
-               goto cleanup;
-       }
 
        /* deref suffix alias if appropriate */
        ndn = suffix_alias( be, ndn );
@@ -179,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;
 }