X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fava.c;h=e0fdd8bb2e8decf242ae5c381d37f9d9d83996f9;hb=104f8cc409822fcdf5aa98ae14f738d869e00eb5;hp=69157a954a278a91bc1bf4acf94f4573872ae089;hpb=f49fd8a98e6849f74e50a01165f4214b065b9b00;p=openldap

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 69157a954a..e0fdd8bb2e 100644
--- 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-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* ava.c - routines for dealing with attribute value assertions */
@@ -21,8 +21,7 @@ ava_free(
     int	freeit
 )
 {
-	ad_free( ava->aa_desc, 1 );
-	ber_bvfree( ava->aa_value );
+	free( ava->aa_value.bv_val );
 	if ( freeit ) {
 		ch_free( (char *) ava );
 	}
@@ -37,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
@@ -55,29 +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 ) {
-		ad_free( aa->aa_desc, 1 );
 		ch_free( aa );
 		return rc;
 	}
 
-	aa->aa_value = nvalue;
 	*ava = aa;
 
 	return LDAP_SUCCESS;
 }
-