Changed be_issuffix and dnParent to struct bervals

[openldap] / servers / slapd / mra.c

diff --git a/servers/slapd/mra.c b/servers/slapd/mra.c
index c5133c07c6d1f782117ec7f00306e2b63cabe72f..87b4a47dda779fc9b6fd5d655690eeae8a9ea171 100644 (file)
--- a/servers/slapd/mra.c
+++ b/servers/slapd/mra.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
  */
 /* mra.c - routines for dealing with extensible matching rule assertions */
@@ -21,8 +21,10 @@ mra_free(
     int        freeit
 )
 {
+#if 0  /* no longer a malloc'd string */
        ch_free( mra->ma_rule_text.bv_val );
-       ber_bvfree( mra->ma_value );
+#endif
+       ch_free( mra->ma_value.bv_val );
        if ( freeit ) {
                ch_free( (char *) mra );
        }
@@ -37,7 +39,7 @@ get_mra(
 {
        int rc, tag;
        ber_len_t length;
-       struct berval type, value, *nvalue;
+       struct berval type, value;
        MatchingRuleAssertion *ma;
 
        ma = ch_malloc( sizeof( MatchingRuleAssertion ) );
@@ -46,7 +48,7 @@ get_mra(
        ma->ma_rule_text.bv_len = 0;
        ma->ma_desc = NULL;
        ma->ma_dnattrs = 0;
-       ma->ma_value = NULL;
+       ma->ma_value.bv_val = NULL;
 
        rc = ber_scanf( ber, "{t", &tag );
 
@@ -64,7 +66,7 @@ get_mra(
        }
 
        if ( tag == LDAP_FILTER_EXT_OID ) {
-               rc = ber_scanf( ber, "o", &ma->ma_rule_text );
+               rc = ber_scanf( ber, "m", &ma->ma_rule_text );
                if ( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
@@ -96,7 +98,7 @@ get_mra(
        }
 
        if ( tag == LDAP_FILTER_EXT_TYPE ) {
-               rc = ber_scanf( ber, "o", &type );
+               rc = ber_scanf( ber, "m", &type );
                if ( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
                        LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
@@ -110,7 +112,6 @@ get_mra(
                }
 
                rc = slap_bv2ad( &type, &ma->ma_desc, text );
-               ch_free( type.bv_val );
 
                if( rc != LDAP_SUCCESS ) {
                        mra_free( ma, 1 );
@@ -146,7 +147,7 @@ get_mra(
                return SLAPD_DISCONNECT;
        }
 
-       rc = ber_scanf( ber, "o", &value );
+       rc = ber_scanf( ber, "m", &value );
 
        if( rc == LBER_ERROR ) {
 #ifdef NEW_LOGGING
@@ -165,16 +166,13 @@ get_mra(
         * OK, if no matching rule, normalize for equality, otherwise
         * normalize for the matching rule.
         */
-       rc = value_normalize( ma->ma_desc, SLAP_MR_EQUALITY, &value, &nvalue, text );
-       ch_free( value.bv_val );
+       rc = value_normalize( ma->ma_desc, SLAP_MR_EQUALITY, &value, &ma->ma_value, text );
 
        if( rc != LDAP_SUCCESS ) {
                mra_free( ma, 1 );
                return rc;
        }
 
-       ma->ma_value = nvalue;
-
        tag = ber_peek_tag( ber, &length );
 
        if ( tag == LDAP_FILTER_EXT_DNATTRS ) {