fix some ava bugs

diff --git a/servers/slapd/back-meta/compare.c b/servers/slapd/back-meta/compare.c
index fd009c57dc4d27e297889247ddcfc887051a6b1e..b68f8c70be2d5d3f22fbabc251a44334869fd910 100644 (file)
--- a/servers/slapd/back-meta/compare.c
+++ b/servers/slapd/back-meta/compare.c
@@ -110,7 +110,7 @@ meta_back_compare(
        for ( i = 0, lsc = lc->conns; lsc[ 0 ] != NULL; ++i, ++lsc ) {
                char *mdn = NULL;
                char *mapped_attr = ava->aa_desc->ad_cname.bv_val;
-               char *mapped_value = ava->aa_value->bv_val;
+               char *mapped_value = ava->aa_value.bv_val;
 
                if ( lsc[ 0 ]->candidate != META_CANDIDATE ) {
                        continue;
@@ -156,7 +156,7 @@ meta_back_compare(
                if ( ava->aa_desc->ad_type->sat_oid 
                        == slap_schema.si_ad_objectClass->ad_type->sat_oid ) {
                        mapped_value = ldap_back_map( &li->targets[ i ]->oc_map,
-                                       ava->aa_value->bv_val, 0 );
+                                       ava->aa_value.bv_val, 0 );
 
                        if ( mapped_value == NULL ) {
                                lsc[ 0 ]->candidate = META_NOT_CANDIDATE;
@@ -192,7 +192,7 @@ meta_back_compare(
                if ( mapped_attr != ava->aa_desc->ad_cname.bv_val ) {
                        free( mapped_attr );
                }
-               if ( mapped_value != ava->aa_value->bv_val ) {
+               if ( mapped_value != ava->aa_value.bv_val ) {
                        free( mapped_value );
                }
 

diff --git a/servers/slapd/back-monitor/compare.c b/servers/slapd/back-monitor/compare.c
index b615f18f50485dafcb3063c9e2238d8bcdbecbbe..e3b075e742991b4c78150eb4c8b6af53700bc84b 100644 (file)
--- a/servers/slapd/back-monitor/compare.c
+++ b/servers/slapd/back-monitor/compare.c
@@ -69,7 +69,7 @@ monitor_back_compare(
        }
 
        rc = access_allowed( be, conn, op, e, ava->aa_desc, 
-                       ava->aa_value, ACL_COMPARE );
+                       &ava->aa_value, ACL_COMPARE );
        if ( !rc ) {
                send_ldap_result( conn, op, LDAP_INSUFFICIENT_ACCESS,
                                NULL, NULL, NULL, NULL );
@@ -84,7 +84,7 @@ monitor_back_compare(
                        a = attrs_find( a->a_next, ava->aa_desc )) {
                rc = LDAP_COMPARE_FALSE;
 
-               if ( value_find( ava->aa_desc, a->a_vals, ava->aa_value ) == 0 ) {
+               if ( value_find( ava->aa_desc, a->a_vals, &ava->aa_value ) == 0 ) {
                        rc = LDAP_COMPARE_TRUE;
                        break;
                }