fix for select_backend suggested G. Gombas (ITS 1090)

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index b8c93fc132ebc05a13eff6ced07f86349cb7fbb3..4f2b993532f3999d6a5d47f9afca1a46737968f0 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -37,13 +37,18 @@ 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;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
+                  "do_compare: conn %d\n", conn->c_connid ));
+#else
        Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
-
+#endif
        /*
         * Parse the compare request.  It looks like this:
         *
@@ -57,14 +62,24 @@ do_compare(
         */
 
        if ( ber_scanf( op->o_ber, "{a" /*}*/, &dn ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_compare: conn %d  ber_scanf failed\n", conn->c_connid ));
+#else
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
+#endif
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
                return SLAPD_DISCONNECT;
        }
 
        if ( ber_scanf( op->o_ber, "{oo}", &desc, &value ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_compare: conn %d  get ava failed\n", conn->c_connid ));
+#else
                Debug( LDAP_DEBUG_ANY, "do_compare: get ava failed\n", 0, 0, 0 );
+#endif
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
                rc = SLAPD_DISCONNECT;
@@ -72,7 +87,12 @@ do_compare(
        }
 
        if ( ber_scanf( op->o_ber, /*{*/ "}" ) == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
+                          "do_compare: conn %d  ber_scanf failed\n", conn->c_connid ));
+#else
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
+#endif
                send_ldap_disconnect( conn, op,
                        LDAP_PROTOCOL_ERROR, "decoding error" );
                rc = SLAPD_DISCONNECT;
@@ -80,33 +100,59 @@ do_compare(
        }
 
        if( ( rc = get_ctrls( conn, op, 1 )) != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_compare: conn %d  get_ctrls failed\n", conn->c_connid ));
+#else
                Debug( LDAP_DEBUG_ANY, "do_compare: get_ctrls failed\n", 0, 0, 0 );
+#endif
                goto cleanup;
        } 
 
        ndn = ch_strdup( dn );
 
        if( dn_normalize( ndn ) == NULL ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+                          "do_compare: conn %d  invalid dn (%s)\n",
+                          conn->c_connid, dn ));
+#else
                Debug( LDAP_DEBUG_ANY, "do_compare: invalid dn (%s)\n", dn, 0, 0 );
+#endif
                send_ldap_result( conn, op, rc = LDAP_INVALID_DN_SYNTAX, NULL,
                    "invalid DN", NULL, NULL );
                goto cleanup;
        }
 
+       if( ndn == '\0' ) {
+#ifdef NEW_LOGGING
+               LDAP_LOG(( "operation", LDAP_LEVEL_DETAIL1,
+                          "do_compare: conn %d  compare to root DSE!\n",
+                          conn->c_connid ));
+#else
+               Debug( LDAP_DEBUG_ANY, "do_compare: root dse!\n", 0, 0, 0 );
+#endif
+               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 )) == NULL ) {
+       if ( (be = select_backend( ndn, manageDSAit )) == 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 ) ;
+       /* 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 );
@@ -143,8 +189,15 @@ do_compare(
 
        ava.aa_value = nvalue;
 
+#ifdef NEW_LOGGING
+       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
+                  "do_compare: conn %d  dn (%s) attr(%s) value (%s)\n",
+                  conn->c_connid, dn, ava.aa_desc->ad_cname->bv_val,
+                  ava.aa_value->bv_val ));
+#else
        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 );
+#endif
 
        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 );