= slap_schema.si_ad_objectClass;
int extensible = 0;
int subentry = is_entry_subentry( e );
- int collective = 0;
+ int collectiveSubentry = 0;
- if( subentry) collective = is_entry_collectiveAttributes( e );
+ if( subentry) collectiveSubentry = is_entry_collectiveAttributeSubentry( e );
*text = textbuf;
}
}
- if( !collective && is_at_collective( a->a_desc->ad_type ) ) {
- snprintf( textbuf, textlen, "attribute '%s' "
- "may only appear in collectiveAttributes subentry",
+ if( !collectiveSubentry && is_at_collective( a->a_desc->ad_type ) ) {
+ snprintf( textbuf, textlen,
+ "'%s' can only appear in collectiveAttributeSubentry",
type );
return LDAP_OBJECT_CLASS_VIOLATION;
}
return LDAP_OBJECT_CLASS_VIOLATION;
}
- if ( oc->sco_check ) {
- int rc = (oc->sco_check)( be, e, oc,
+ if ( oc->soc_check ) {
+ int rc = (oc->soc_check)( be, e, oc,
text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
return rc;
}
}
+
if ( oc->soc_kind == LDAP_SCHEMA_ABSTRACT ) {
/* object class is abstract */
if ( oc != slap_schema.si_oc_top &&
int oc_check_allowed(
AttributeType *at,
- BVarray ocl,
+ BerVarray ocl,
ObjectClass *sc )
{
int i, j;
* Determine the structural object class from a set of OIDs
*/
int structural_class(
- BVarray ocs,
+ BerVarray ocs,
struct berval *scbv,
ObjectClass **scp,
const char **text,
if( oc == NULL ) {
snprintf( textbuf, textlen,
- "unrecongized objectClass '%s'",
+ "unrecognized objectClass '%s'",
ocs[i].bv_val );
*text = textbuf;
return LDAP_OBJECT_CLASS_VIOLATION;
if( xc == NULL ) {
snprintf( textbuf, textlen,
- "unrecongized objectClass '%s'",
+ "unrecognized objectClass '%s'",
ocs[i].bv_val );
*text = textbuf;
return LDAP_OBJECT_CLASS_VIOLATION;