AC_MEMCPY( oc->soc_cname.bv_val, ocname->bv_val, ocname->bv_len );
LDAP_STAILQ_NEXT( oc, soc_next ) = NULL;
+ ldap_pvt_thread_mutex_lock( &oc_undef_mutex );
LDAP_STAILQ_INSERT_HEAD( &oc_undef_list, oc, soc_next );
+ ldap_pvt_thread_mutex_unlock( &oc_undef_mutex );
return oc;
}
static int
oc_create_required(
- ObjectClass *soc,
- char **attrs,
+ ObjectClass *soc,
+ char **attrs,
int *op,
- const char **err )
+ const char **err )
{
char **attrs1;
AttributeType *sat;
}
/* Now delete duplicates from the allowed list */
for ( satp = soc->soc_required; *satp; satp++ ) {
- i = at_find_in_list(*satp,soc->soc_allowed);
+ i = at_find_in_list(*satp, soc->soc_allowed);
if ( i >= 0 ) {
at_delete_from_list(i, &soc->soc_allowed);
}
static int
oc_add_sups(
- ObjectClass *soc,
- char **sups,
+ ObjectClass *soc,
+ char **sups,
int *op,
- const char **err )
+ const char **err )
{
int code;
ObjectClass *soc1;
code = oc_add_sups( soc, soc->soc_sup_oids, &op, err );
}
- if ( code != 0 ) return code;
- if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
+ if ( code != 0 ) {
+ goto done;
+ }
+
+ if ( user && op ) {
+ code = SLAP_SCHERR_CLASS_BAD_SUP;
+ goto done;
+ }
code = oc_create_required( soc, soc->soc_at_oids_must, &op, err );
- if ( code != 0 ) return code;
+ if ( code != 0 ) {
+ goto done;
+ }
code = oc_create_allowed( soc, soc->soc_at_oids_may, &op, err );
- if ( code != 0 ) return code;
+ if ( code != 0 ) {
+ goto done;
+ }
- if( user && op ) return SLAP_SCHERR_CLASS_BAD_USAGE;
+ if ( user && op ) {
+ code = SLAP_SCHERR_CLASS_BAD_USAGE;
+ goto done;
+ }
- if( !user ) soc->soc_flags |= SLAP_OC_HARDCODE;
+ if ( !user ) {
+ soc->soc_flags |= SLAP_OC_HARDCODE;
+ }
code = oc_insert(soc,err);
- if ( code == 0 && rsoc )
+done:;
+ if ( code != 0 ) {
+ if ( soc->soc_sups ) {
+ ch_free( soc->soc_sups );
+ }
+
+ if ( soc->soc_required ) {
+ ch_free( soc->soc_required );
+ }
+
+ if ( soc->soc_allowed ) {
+ ch_free( soc->soc_allowed );
+ }
+
+ ch_free( soc );
+
+ } else if ( rsoc ) {
*rsoc = soc;
+ }
return code;
}