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 5732a3777f220edd10f0108899801131fe8d554d..01287a0b4f040dd17cfc99dbc327018ba0673c95 100644 (file)
--- 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,37 +14,64 @@
 
 #include "slap.h"
 
+
+void
+ava_free(
+    AttributeAssertion *ava,
+    int        freeit
+)
+{
+       free( ava->aa_value.bv_val );
+       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;
+       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 );
-               return( -1 );
+#endif
+               *text = "Error decoding attribute value assertion";
+               return SLAPD_DISCONNECT;
        }
 
-       attr_normalize( ava->ava_type );
+       aa = ch_malloc( sizeof( AttributeAssertion ) );
+       aa->aa_desc = NULL;
+       aa->aa_value.bv_val = NULL;
 
-#ifndef SLAPD_SCHEMA_NOT_COMPAT
-       value_normalize( ava->ava_value.bv_val, attr_syntax( ava->ava_type ) );
-#endif
+       rc = slap_bv2ad( &type, &aa->aa_desc, text );
 
-       return( LDAP_SUCCESS );
-}
+       if( rc != LDAP_SUCCESS ) {
+               ch_free( aa );
+               return rc;
+       }
 
-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 = value_validate_normalize( aa->aa_desc, usage,
+               &value, &aa->aa_value, text );
+
+       if( rc != LDAP_SUCCESS ) {
+               ch_free( aa );
+               return rc;
        }
-}
 
+       *ava = aa;
+
+       return LDAP_SUCCESS;
+}