X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fava.c;h=da6a2e3355ae37a296b8e9b24387ad04d394e690;hb=0f30fb0d8f0adbbb7b41fd455c57aa56d64c9853;hp=b3f314050abd88193ed4196eba1acfdf06485ff3;hpb=403f4479bc9f9a864122d4aeecf7284408918302;p=openldap

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index b3f314050a..da6a2e3355 100644
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* ava.c - routines for dealing with attribute value assertions */
@@ -14,33 +14,68 @@
 
 #include "slap.h"
 
+
+void
+ava_free(
+    AttributeAssertion *ava,
+    int	freeit
+)
+{
+	ber_bvfree( ava->aa_value );
+	if ( freeit ) {
+		ch_free( (char *) ava );
+	}
+}
+
 int
 get_ava(
     BerElement	*ber,
-    Ava		*ava
+    AttributeAssertion	**ava,
+	unsigned usage,
+	const char **text
 )
 {
-	if ( ber_scanf( ber, "{ao}", &ava->ava_type, &ava->ava_value )
-	    == LBER_ERROR ) {
+	int rc;
+	struct berval type, value, *nvalue;
+	AttributeAssertion *aa;
+
+	rc = ber_scanf( ber, "{oo}", &type, &value );
+
+	if( rc == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
+			   "get_ava:  ber_scanf failure\n" ));
+#else
 		Debug( LDAP_DEBUG_ANY, "  get_ava ber_scanf\n", 0, 0, 0 );
-		return( -1 );
+#endif
+		*text = "Error decoding attribute value assertion";
+		return SLAPD_DISCONNECT;
 	}
-	attr_normalize( ava->ava_type );
-	value_normalize( ava->ava_value.bv_val, attr_syntax( ava->ava_type ) );
 
-	return( LDAP_SUCCESS );
-}
+	aa = ch_malloc( sizeof( AttributeAssertion ) );
+	aa->aa_desc = NULL;
+	aa->aa_value = NULL;
 
-void
-ava_free(
-    Ava	*ava,
-    int	freeit
-)
-{
-	free( (char *) ava->ava_type );
-	free( (char *) ava->ava_value.bv_val );
-	if ( freeit ) {
-		free( (char *) ava );
+	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 );
+
+	if( rc != LDAP_SUCCESS ) {
+		ch_free( aa );
+		return rc;
 	}
+
+	aa->aa_value = nvalue;
+	*ava = aa;
+
+	return LDAP_SUCCESS;
 }