add new ber dump routine (behind NEW_LOGGING)

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index a26c49741cf65ba11394ce0e4db25958f6aa86d4..262304a514770b265a6c4e134c09bb862caaaef3 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"
@@ -38,7 +37,9 @@ do_compare(
        Backend *be;
        int rc = LDAP_SUCCESS;
        const char *text = NULL;
+       int manageDSAit;
 
+       ava.aa_desc = NULL;
        desc.bv_val = NULL;
        value.bv_val = NULL;
 
@@ -93,7 +94,41 @@ do_compare(
                goto cleanup;
        }
 
-       ava.aa_desc = NULL;
+       if( ndn == '\0' ) {
+               Debug( LDAP_DEBUG_ANY, "do_compare: root dse!\n", 0, 0, 0 );
+               send_ldap_result( conn, op, rc = LDAP_UNWILLING_TO_PERFORM,
+                       NULL, "compare upon the root DSE not supported", NULL, NULL );
+               goto cleanup;
+       }
+
+       manageDSAit = get_manageDSAit( op );
+
+       /*
+        * 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, manageDSAit )) == NULL ) {
+               send_ldap_result( conn, op, rc = LDAP_REFERRAL,
+                       NULL, NULL, default_referral, NULL );
+               rc = 1;
+               goto cleanup;
+       }
+
+       /* check restrictions */
+       rc = backend_check_restrictions( be, conn, op, NULL, &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,
@@ -125,28 +160,6 @@ do_compare(
            op->o_connid, op->o_opid, dn, ava.aa_desc->ad_cname->bv_val, 0 );
 
 
-
-       /*
-        * 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 );