More system schema checks

[openldap] / servers / slapd / ava.c

diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index 5493cb2be3fd15355697259d225a3527a0631840..c9c2c1fee9bf9e95a9e22daf1a09dbe8f96f1c0c 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-2002 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,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 );
        }
@@ -32,70 +30,47 @@ ava_free(
 int
 get_ava(
     BerElement *ber,
-    AttributeAssertion **ava
+    AttributeAssertion **ava,
+       unsigned usage,
+       const char **text
 )
 {
        int rc;
-       char *text;
-       struct berval type, *value;
+       struct berval type, value;
        AttributeAssertion *aa;
 
-       rc = ber_scanf( ber, "{oO}", &type, &value );
+       rc = ber_scanf( ber, "{mm}", &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 );
+#endif
+               *text = "Error decoding attribute value assertion";
                return SLAPD_DISCONNECT;
        }
 
        aa = ch_malloc( sizeof( AttributeAssertion ) );
        aa->aa_desc = NULL;
+       aa->aa_value.bv_val = NULL;
 
-       rc = slap_bv2ad( &type, &aa->aa_desc, &text );
+       rc = slap_bv2ad( &type, &aa->aa_desc, text );
 
        if( rc != LDAP_SUCCESS ) {
-               ch_free( type.bv_val );
-               ber_bvfree( value );
                ch_free( aa );
                return rc;
        }
 
-       aa->aa_value = value;
-       *ava = aa;
-
-       return LDAP_SUCCESS;
-}
-
-#else
+       rc = value_normalize( aa->aa_desc, usage, &value, &aa->aa_value, text );
 
-void
-ava_free(
-    Ava        *ava,
-    int        freeit
-)
-{
-       ch_free( (char *) ava->ava_type );
-       ch_free( (char *) ava->ava_value.bv_val );
-       if ( freeit ) {
-               ch_free( (char *) ava );
-       }
-}
-
-int
-get_ava(
-    BerElement *ber,
-    Ava                *ava
-)
-{
-       if ( ber_scanf( ber, "{ao}", &ava->ava_type, &ava->ava_value )
-           == LBER_ERROR ) {
-               Debug( LDAP_DEBUG_ANY, "  get_ava ber_scanf\n", 0, 0, 0 );
-               return SLAPD_DISCONNECT;
+       if( rc != LDAP_SUCCESS ) {
+               ch_free( aa );
+               return rc;
        }
 
-       attr_normalize( ava->ava_type );
-       value_normalize( ava->ava_value.bv_val, attr_syntax( ava->ava_type ) );
+       *ava = aa;
 
        return LDAP_SUCCESS;
 }
-
-#endif