X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fava.c;h=63a1b288457afcf1fa78a9d9312f37489c2089e1;hb=e2483d8a9bc7fa72bac53d8af3ed215d3a1d80d0;hp=c9c2c1fee9bf9e95a9e22daf1a09dbe8f96f1c0c;hpb=ec46a2f33a602c5603f1cf6415b183f6ff0939d5;p=openldap
diff --git a/servers/slapd/ava.c b/servers/slapd/ava.c
index c9c2c1fee9..63a1b28845 100644
--- a/servers/slapd/ava.c
+++ b/servers/slapd/ava.c
@@ -1,9 +1,28 @@
+/* ava.c - routines for dealing with attribute value assertions */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software .
+ *
+ * Copyright 1998-2003 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
+ * .
+ */
+/* 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.
*/
-/* ava.c - routines for dealing with attribute value assertions */
#include "portable.h"
@@ -17,34 +36,36 @@
void
ava_free(
- AttributeAssertion *ava,
- int freeit
+ Operation *op,
+ AttributeAssertion *ava,
+ int freeit
)
{
- free( ava->aa_value.bv_val );
+ op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx );
if ( freeit ) {
- ch_free( (char *) ava );
+ op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
}
}
int
get_ava(
- BerElement *ber,
- AttributeAssertion **ava,
+ Operation *op,
+ BerElement *ber,
+ AttributeAssertion **ava,
unsigned usage,
const char **text
)
{
int rc;
+ ber_tag_t rtag;
struct berval type, value;
AttributeAssertion *aa;
- rc = ber_scanf( ber, "{mm}", &type, &value );
+ rtag = ber_scanf( ber, "{mm}", &type, &value );
- if( rc == LBER_ERROR ) {
+ if( rtag == LBER_ERROR ) {
#ifdef NEW_LOGGING
- LDAP_LOG(( "filter", LDAP_LEVEL_ERR,
- "get_ava: ber_scanf failure\n" ));
+ 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
@@ -52,21 +73,37 @@ get_ava(
return SLAPD_DISCONNECT;
}
- aa = ch_malloc( sizeof( AttributeAssertion ) );
+ aa = op->o_tmpalloc( sizeof( AttributeAssertion ), op->o_tmpmemctx );
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 );
+#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 = value_normalize( aa->aa_desc, usage, &value, &aa->aa_value, text );
+ 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 ) {
- ch_free( aa );
+#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;
}