X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fava.c;h=9cfde4b98d3e04b8f94fe9c756543b47506f3c51;hb=1bae6d28e5d764ce52a2ba62838534420a0a3fa3;hp=0200d035f6bf1064265a429c7402922a44801471;hpb=e96865c1a813a4dd227edd9d95c900d0128c0dde;p=openldap

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 0200d035f6..9cfde4b98d 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-2003 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 /* ava.c - routines for dealing with attribute value assertions */
@@ -14,7 +14,6 @@
 
 #include "slap.h"
 
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
 
 void
 ava_free(
@@ -22,23 +21,7 @@ ava_free(
     int	freeit
 )
 {
-	ad_free( ava->aa_desc, 1 );
-	ber_bvfree( ava->aa_value );
-	if ( freeit ) {
-		ch_free( (char *) ava );
-	}
-}
-
-#else
-
-void
-ava_free(
-    Ava	*ava,
-    int	freeit
-)
-{
-	ch_free( (char *) ava->ava_type );
-	ch_free( (char *) ava->ava_value.bv_val );
+	free( ava->aa_value.bv_val );
 	if ( freeit ) {
 		ch_free( (char *) ava );
 	}
@@ -47,19 +30,49 @@ ava_free(
 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;
+	ber_tag_t rtag;
+	struct berval type, value;
+	AttributeAssertion *aa;
+
+	rtag = ber_scanf( ber, "{mm}", &type, &value );
+
+	if( rtag == LBER_ERROR ) {
+#ifdef NEW_LOGGING
+		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
+		*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 ) );
+	aa = ch_malloc( sizeof( AttributeAssertion ) );
+	aa->aa_desc = NULL;
+	aa->aa_value.bv_val = NULL;
+
+	rc = slap_bv2ad( &type, &aa->aa_desc, text );
+
+	if( rc != LDAP_SUCCESS ) {
+		ch_free( aa );
+		return rc;
+	}
+
+	rc = asserted_value_validate_normalize(
+		aa->aa_desc, ad_mr(aa->aa_desc, usage),
+		usage, &value, &aa->aa_value, text );
+
+	if( rc != LDAP_SUCCESS ) {
+		ch_free( aa );
+		return rc;
+	}
+
+	*ava = aa;
 
 	return LDAP_SUCCESS;
 }
-
-#endif