struct slap_syntax *syntax, /* NULL if in is asserted value */
struct slap_matching_rule *mr,
struct berval * in,
- struct berval * out )
+ struct berval * out,
+ void *ctx )
{
ObjectClass *oc = oc_bvfind( in );
if( oc != NULL ) {
- ber_dupbv( out, &oc->soc_cname );
+ ber_dupbv_x( out, &oc->soc_cname, ctx );
} else {
- ber_dupbv( out, in );
+ ber_dupbv_x( out, in, ctx );
}
#if OCDEBUG
struct slap_matching_rule *mr,
struct berval *prefix,
BerVarray values,
- BerVarray *keysp )
+ BerVarray *keysp,
+ void *ctx )
{
int rc, noc, i;
BerVarray ocvalues;
}
/* over allocate */
- ocvalues = ch_malloc( sizeof( struct berval ) * (noc+16) );
+ ocvalues = sl_malloc( sizeof( struct berval ) * (noc+16), ctx );
/* copy listed values (and termination) */
for( i=0; i<noc; i++ ) {
}
if( !found ) {
- ocvalues = ch_realloc( ocvalues,
- sizeof( struct berval ) * (noc+2) );
+ ocvalues = sl_realloc( ocvalues,
+ sizeof( struct berval ) * (noc+2), ctx );
assert( k == noc );
#endif
rc = octetStringIndexer( use, mask, syntax, mr,
- prefix, ocvalues, keysp );
+ prefix, ocvalues, keysp, ctx );
- ch_free( ocvalues );
+ sl_free( ocvalues, ctx );
return rc;
}
MatchingRule *mr,
struct berval *prefix,
void * assertedValue,
- BerVarray *keysp )
+ BerVarray *keysp,
+ void *ctx )
{
#if OCDEBUG
struct berval *bv = (struct berval *) assertedValue;
#endif
return octetStringFilter( use, flags, syntax, mr,
- prefix, assertedValue, keysp );
+ prefix, assertedValue, keysp, ctx );
}
static ObjectClassSchemaCheckFN rootDseObjectClass;
"matchingRuleUse ) )",
subentryObjectClass, SLAP_OC_OPERATIONAL,
offsetof(struct slap_internal_schema, si_oc_subschema) },
- { "monitor", "( 1.3.6.1.4.1.4203.666.3.2 NAME 'monitor' "
- "DESC 'OpenLDAP system monitoring' "
- "STRUCTURAL "
- "MUST cn )",
- 0, SLAP_OC_OPERATIONAL,
- offsetof(struct slap_internal_schema, si_oc_monitor) },
#ifdef LDAP_DEVEL
{ "collectiveAttributeSubentry", "( 2.5.17.2 "
"NAME 'collectiveAttributeSubentry' "
NULL, NULL, NULL, NULL, NULL,
offsetof(struct slap_internal_schema, si_ad_krbName) },
#endif
-
{ NULL, NULL, NULL, 0, NULL, NULL, NULL, NULL, NULL, 0 }
};
offsetof(struct slap_internal_schema, si_mr_distinguishedNameMatch) },
{ "integerMatch",
offsetof(struct slap_internal_schema, si_mr_integerMatch) },
- { "integerFirstComponentMatch",
- offsetof(struct slap_internal_schema,
- si_mr_integerFirstComponentMatch) },
+ { "integerFirstComponentMatch", offsetof(struct slap_internal_schema,
+ si_mr_integerFirstComponentMatch) },
{ NULL, 0 }
};