openldap/servers/slapd/ava.c
Kurt Zeilenga 8d407bc2a6 Modify ava code to return error text
Filter code needs to be updated to properly handle soft errors.
2000-05-16 21:03:18 +00:00

105 lines
1.8 KiB
C

/* $OpenLDAP$ */
/*
* Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
/* ava.c - routines for dealing with attribute value assertions */
#include "portable.h"
#include <stdio.h>
#include <ac/string.h>
#include <ac/socket.h>
#include "slap.h"
#ifdef SLAPD_SCHEMA_NOT_COMPAT
void
ava_free(
AttributeAssertion *ava,
int freeit
)
{
ad_free( ava->aa_desc, 1 );
ber_bvfree( ava->aa_value );
if ( freeit ) {
ch_free( (char *) ava );
}
}
int
get_ava(
BerElement *ber,
AttributeAssertion **ava,
char **text
)
{
int rc;
struct berval type, *value;
AttributeAssertion *aa;
rc = ber_scanf( ber, "{oO}", &type, &value );
if( rc == LBER_ERROR ) {
Debug( LDAP_DEBUG_ANY, " get_ava ber_scanf\n", 0, 0, 0 );
*text = "Error decoding attribute value assertion";
return SLAPD_DISCONNECT;
}
aa = ch_malloc( sizeof( AttributeAssertion ) );
aa->aa_desc = NULL;
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
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,
char **text
)
{
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 );
*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;
}
#endif