Add calls to module_init/module_kill to support dynamically loaded backends.

[openldap] / servers / slapd / compare.c

diff --git a/servers/slapd/compare.c b/servers/slapd/compare.c
index d10dec51c97dcb28d5aac8a0c5d55f1f8d1754bc..61a8f6882ef9fd19253ab4aef568e2ccd6cd3552 100644 (file)
--- a/servers/slapd/compare.c
+++ b/servers/slapd/compare.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /*
@@ -41,7 +41,7 @@ do_compare(
        struct berval ndn = { 0, NULL };
        struct berval desc = { 0, NULL };
        struct berval value = { 0, NULL };
-       AttributeAssertion ava;
+       AttributeAssertion ava = { 0 };
        Backend *be;
        int rc = LDAP_SUCCESS;
        const char *text = NULL;
@@ -50,8 +50,7 @@ do_compare(
        ava.aa_desc = NULL;
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ENTRY,
-               "do_compare: conn %d\n", conn->c_connid ));
+       LDAP_LOG( OPERATION, ENTRY, "do_compare: conn %d\n", conn->c_connid, 0, 0 );
 #else
        Debug( LDAP_DEBUG_TRACE, "do_compare\n", 0, 0, 0 );
 #endif
@@ -67,10 +66,10 @@ do_compare(
         *      }
         */
 
-       if ( ber_scanf( op->o_ber, "{o" /*}*/, &dn ) == LBER_ERROR ) {
+       if ( ber_scanf( op->o_ber, "{m" /*}*/, &dn ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_compare: conn %d  ber_scanf failed\n", conn->c_connid ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_compare: conn %d  ber_scanf failed\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -79,10 +78,10 @@ do_compare(
                return SLAPD_DISCONNECT;
        }
 
-       if ( ber_scanf( op->o_ber, "{oo}", &desc, &value ) == LBER_ERROR ) {
+       if ( ber_scanf( op->o_ber, "{mm}", &desc, &value ) == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
-                       "do_compare: conn %d  get ava failed\n", conn->c_connid ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_compare: conn %d  get ava failed\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_compare: get ava failed\n", 0, 0, 0 );
 #endif
@@ -94,8 +93,8 @@ 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 ));
+               LDAP_LOG( OPERATION, ERR, 
+                       "do_compare: conn %d  ber_scanf failed\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "ber_scanf failed\n", 0, 0, 0 );
 #endif
@@ -107,8 +106,8 @@ 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 ));
+               LDAP_LOG( OPERATION, INFO, 
+                       "do_compare: conn %d  get_ctrls failed\n", conn->c_connid, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "do_compare: get_ctrls failed\n", 0, 0, 0 );
 #endif
@@ -118,9 +117,9 @@ do_compare(
        rc = dnPrettyNormal( NULL, &dn, &pdn, &ndn );
        if( rc != LDAP_SUCCESS ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_INFO,
+               LDAP_LOG( OPERATION, INFO, 
                        "do_compare: conn %d  invalid dn (%s)\n",
-                       conn->c_connid, dn.bv_val ));
+                       conn->c_connid, dn.bv_val, 0 );
 #else
                Debug( LDAP_DEBUG_ANY,
                        "do_compare: invalid dn (%s)\n", dn.bv_val, 0, 0 );
@@ -136,7 +135,8 @@ do_compare(
                goto cleanup;
        }
 
-       rc = value_normalize( ava.aa_desc, SLAP_MR_EQUALITY, &value, &ava.aa_value, &text );
+       rc = value_validate_normalize( ava.aa_desc, SLAP_MR_EQUALITY,
+               &value, &ava.aa_value, &text );
        if( rc != LDAP_SUCCESS ) {
                send_ldap_result( conn, op, rc, NULL, text, NULL, NULL );
                goto cleanup;
@@ -144,17 +144,16 @@ do_compare(
 
        if( strcasecmp( ndn.bv_val, LDAP_ROOT_DSE ) == 0 ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-                       "do_compare: conn %d  dn (%s) attr(%s) value (%s)\n",
-                       conn->c_connid, pdn.bv_val,
-                       ava.aa_desc->ad_cname.bv_val, ava.aa_value.bv_val ));
+               LDAP_LOG( OPERATION, ARGS, 
+                       "do_compare: dn (%s) attr(%s) value (%s)\n",
+                       pdn.bv_val, 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",
                        pdn.bv_val, 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",
+                       "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n",
                        op->o_connid, op->o_opid, pdn.bv_val,
                        ava.aa_desc->ad_cname.bv_val, 0 );
 
@@ -170,19 +169,20 @@ do_compare(
                        goto cleanup;
                }
 
-       } else if ( strcasecmp( ndn.bv_val, SLAPD_SCHEMA_DN ) == 0 ) {
+#ifdef SLAPD_SCHEMA_DN
+       } else if ( bvmatch( &ndn, &global_schemandn ) ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-                       "do_compare: conn %d  dn (%s) attr(%s) value (%s)\n",
-                       conn->c_connid, pdn.bv_val, ava.aa_desc->ad_cname.bv_val,
-                       ava.aa_value.bv_val ));
+               LDAP_LOG( OPERATION, ARGS, 
+                       "do_compare: dn (%s) attr(%s) value (%s)\n",
+                       pdn.bv_val, 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",
                        pdn.bv_val, 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",
+                       "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n",
                        op->o_connid, op->o_opid, pdn.bv_val,
                        ava.aa_desc->ad_cname.bv_val, 0 );
 
@@ -199,6 +199,7 @@ do_compare(
                        rc = 0;
                        goto cleanup;
                }
+#endif /* SLAPD_SCHEMA_DN */
        }
 
        if( entry ) {
@@ -222,13 +223,13 @@ do_compare(
         * if we don't hold it.
         */
        if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
-               struct berval **ref = referral_rewrite( default_referral,
+               BerVarray ref = referral_rewrite( default_referral,
                        NULL, &pdn, LDAP_SCOPE_DEFAULT );
 
                send_ldap_result( conn, op, rc = LDAP_REFERRAL,
                        NULL, NULL, ref ? ref : default_referral, NULL );
 
-               ber_bvecfree( ref );
+               ber_bvarray_free( ref );
                rc = 0;
                goto cleanup;
        }
@@ -248,16 +249,15 @@ do_compare(
        }
 
 #ifdef NEW_LOGGING
-       LDAP_LOG(( "operation", LDAP_LEVEL_ARGS,
-               "do_compare: conn %d     dn (%s) attr(%s) value (%s)\n",
-               conn->c_connid, pdn.bv_val, ava.aa_desc->ad_cname.bv_val,
-               ava.aa_value.bv_val ));
+       LDAP_LOG( OPERATION, ARGS, 
+               "do_compare: dn (%s) attr(%s) value (%s)\n",
+               pdn.bv_val, 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",
            pdn.bv_val, 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",
+       Statslog( LDAP_DEBUG_STATS, "conn=%lu op=%lu CMP dn=\"%s\" attr=\"%s\"\n",
            op->o_connid, op->o_opid, pdn.bv_val,
                ava.aa_desc->ad_cname.bv_val, 0 );
 
@@ -274,11 +274,9 @@ do_compare(
        }
 
 cleanup:
-       free( dn.bv_val );
        free( pdn.bv_val );
        free( ndn.bv_val );
-       free( desc.bv_val );
-       free( value.bv_val );
+       if ( ava.aa_value.bv_val ) free( ava.aa_value.bv_val );
 
        return rc;
 }
@@ -293,7 +291,7 @@ static int compare_entry(
        Attribute *a;
 
        if ( ! access_allowed( NULL, conn, op, e,
-               ava->aa_desc, &ava->aa_value, ACL_COMPARE ) )
+               ava->aa_desc, &ava->aa_value, ACL_COMPARE, NULL ) )
        {       
                return LDAP_INSUFFICIENT_ACCESS;
        }