/* ava.c - routines for dealing with attribute value assertions */
+/* $OpenLDAP$ */
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
+ */
+/* Portions Copyright (c) 1995 Regents of the University of Michigan.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms are permitted
+ * provided that this notice is preserved and that due credit is given
+ * to the University of Michigan at Ann Arbor. The name of the University
+ * may not be used to endorse or promote products derived from this
+ * software without specific prior written permission. This software
+ * is provided ``as is'' without express or implied warranty.
+ */
#include "portable.h"
#include "slap.h"
+
+void
+ava_free(
+ Operation *op,
+ AttributeAssertion *ava,
+ int freeit
+)
+{
+ op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx );
+ if ( freeit ) {
+ op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
+ }
+}
+
int
get_ava(
- BerElement *ber,
- Ava *ava
+ Operation *op,
+ BerElement *ber,
+ 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 );
- value_normalize( ava->ava_value.bv_val, attr_syntax( ava->ava_type ) );
- return( LDAP_SUCCESS );
-}
+ aa = op->o_tmpalloc( sizeof( AttributeAssertion ), op->o_tmpmemctx );
+ aa->aa_desc = NULL;
+ aa->aa_value.bv_val = 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 );
+
+ if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, ERR,
+ "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_FILTER,
+ "get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
+#endif
+ op->o_tmpfree( aa, op->o_tmpmemctx );
+ return rc;
}
-}
+ rc = asserted_value_validate_normalize(
+ aa->aa_desc, ad_mr(aa->aa_desc, usage),
+ usage, &value, &aa->aa_value, text, op->o_tmpmemctx );
+
+ if( rc != LDAP_SUCCESS ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG( FILTER, ERR,
+ "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_FILTER,
+ "get_ava: illegal value for attributeType %s\n", type.bv_val, 0, 0 );
+#endif
+ op->o_tmpfree( aa, op->o_tmpmemctx );
+ return rc;
+ }
+
+ *ava = aa;
+
+ return LDAP_SUCCESS;
+}