/* $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
*/
/*
struct berval ndn = { 0, NULL };
struct berval desc = { 0, NULL };
struct berval value = { 0, NULL };
- AttributeAssertion ava;
+ AttributeAssertion ava = { 0 };
Backend *be;
int rc = LDAP_SUCCESS;
const char *text = NULL;
* }
*/
- if ( ber_scanf( op->o_ber, "{o" /*}*/, &dn ) == LBER_ERROR ) {
+ if ( ber_scanf( op->o_ber, "{m" /*}*/, &dn ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_compare: conn %d ber_scanf failed\n", conn->c_connid ));
return SLAPD_DISCONNECT;
}
- if ( ber_scanf( op->o_ber, "{oo}", &desc, &value ) == LBER_ERROR ) {
+ if ( ber_scanf( op->o_ber, "{mm}", &desc, &value ) == LBER_ERROR ) {
#ifdef NEW_LOGGING
LDAP_LOG(( "operation", LDAP_LEVEL_ERR,
"do_compare: conn %d get ava failed\n", conn->c_connid ));
* if we don't hold it.
*/
if ( (be = select_backend( &ndn, manageDSAit, 0 )) == NULL ) {
- struct berval **ref = referral_rewrite( default_referral,
+ BVarray ref = referral_rewrite( default_referral,
NULL, &pdn, LDAP_SCOPE_DEFAULT );
send_ldap_result( conn, op, rc = LDAP_REFERRAL,
NULL, NULL, ref ? ref : default_referral, NULL );
- ber_bvecfree( ref );
+ bvarray_free( ref );
rc = 0;
goto cleanup;
}
}
cleanup:
- free( dn.bv_val );
free( pdn.bv_val );
free( ndn.bv_val );
- free( desc.bv_val );
- free( value.bv_val );
+ if ( ava.aa_value.bv_val ) free( ava.aa_value.bv_val );
return rc;
}