To conform to the SLAPI spec, slapi_filter_get_ava() should not duplicate

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index da6a2e3355ae37a296b8e9b24387ad04d394e690..01287a0b4f040dd17cfc99dbc327018ba0673c95 100644 (file)
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* ava.c - routines for dealing with attribute value assertions */
@@ -21,7 +21,7 @@ ava_free(
     int        freeit
 )
 {
-       ber_bvfree( ava->aa_value );
+       free( ava->aa_value.bv_val );
        if ( freeit ) {
                ch_free( (char *) ava );
        }
@@ -36,15 +36,15 @@ get_ava(
 )
 {
        int rc;
-       struct berval type, value, *nvalue;
+       ber_tag_t rtag;
+       struct berval type, value;
        AttributeAssertion *aa;
 
-       rc = ber_scanf( ber, "{oo}", &type, &value );
+       rtag = ber_scanf( ber, "{mm}", &type, &value );
 
-       if( rc == LBER_ERROR ) {
+       if( rtag == LBER_ERROR ) {
 #ifdef NEW_LOGGING
-               LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
-                          "get_ava:  ber_scanf failure\n" ));
+               LDAP_LOG( FILTER, ERR, "get_ava:  ber_scanf failure\n", 0, 0, 0 );
 #else
                Debug( LDAP_DEBUG_ANY, "  get_ava ber_scanf\n", 0, 0, 0 );
 #endif
@@ -54,28 +54,24 @@ get_ava(
 
        aa = ch_malloc( sizeof( AttributeAssertion ) );
        aa->aa_desc = NULL;
-       aa->aa_value = NULL;
+       aa->aa_value.bv_val = NULL;
 
        rc = slap_bv2ad( &type, &aa->aa_desc, text );
-       ch_free( type.bv_val );
 
        if( rc != LDAP_SUCCESS ) {
-               ch_free( value.bv_val );
                ch_free( aa );
                return rc;
        }
 
-       rc = value_normalize( aa->aa_desc, usage, &value, &nvalue, text );
-       ch_free( value.bv_val );
+       rc = value_validate_normalize( aa->aa_desc, usage,
+               &value, &aa->aa_value, text );
 
        if( rc != LDAP_SUCCESS ) {
                ch_free( aa );
                return rc;
        }
 
-       aa->aa_value = nvalue;
        *ava = aa;
 
        return LDAP_SUCCESS;
 }
-