servers/slapd/ava.c - diff

Return to ava.c CVS log

Up to [OpenLDAP] / servers / slapd

Diff for /servers/slapd/ava.c between versions 1.46 and 1.47

version 1.46, 2006/12/25 22:30:45	version 1.47, 2006/12/26 03:51:08
Line 1	Line 1
/* ava.c - routines for dealing with attribute value assertions */	/* ava.c - routines for dealing with attribute value assertions */
/* $OpenLDAP: pkg/ldap/servers/slapd/ava.c,v 1.45 2006/01/03 22:12:13 kurt Exp $ */	/* $OpenLDAP: pkg/ldap/servers/slapd/ava.c,v 1.46 2006/12/25 22:30:45 hyc Exp $ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.	/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*	*
* Copyright 1998-2006 The OpenLDAP Foundation.	* Copyright 1998-2006 The OpenLDAP Foundation.
Line 48 ava_free(	Line 48 ava_free(
nibble_mem_free ( ava->aa_cf->cf_ca->ca_comp_data.cd_mem_op );	nibble_mem_free ( ava->aa_cf->cf_ca->ca_comp_data.cd_mem_op );
#endif	#endif
op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx );	op->o_tmpfree( ava->aa_value.bv_val, op->o_tmpmemctx );
	if ( ava->aa_desc->ad_flags & SLAP_DESC_TEMPORARY )
	op->o_tmpfree( ava->aa_desc, op->o_tmpmemctx );
if ( freeit ) op->o_tmpfree( (char *) ava, op->o_tmpmemctx );	if ( freeit ) op->o_tmpfree( (char *) ava, op->o_tmpmemctx );
}	}

Line 87 get_ava(	Line 89 get_ava(
if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
f->f_choice \|= SLAPD_FILTER_UNDEFINED;	f->f_choice \|= SLAPD_FILTER_UNDEFINED;
*text = NULL;	*text = NULL;
rc = slap_bv2undef_ad( &type, &aa->aa_desc, text, SLAP_AD_PROXIED);	rc = slap_bv2undef_ad( &type, &aa->aa_desc, text,
	SLAP_AD_PROXIED\|SLAP_AD_NOINSERT );

if( rc != LDAP_SUCCESS ) {	if( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_FILTER,	Debug( LDAP_DEBUG_FILTER,
"get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );	"get_ava: unknown attributeType %s\n", type.bv_val, 0, 0 );
op->o_tmpfree( aa, op->o_tmpmemctx );	aa->aa_desc = slap_bv2tmp_ad( &type, op->o_tmpmemctx );
	ber_dupbv_x( &aa->aa_value, &value, op->o_tmpmemctx );
	f->f_ava = aa;
return rc;	return rc;
}	}
}	}

Removed from v.1.46
changed lines
	Added in v.1.47