{
int rc;
- struct berval vals[2];
+ ObjectClass *ocs[2];
- ber_str2bv( b->a_group_oc->soc_oid, 0, 0, &vals[0] );
- BER_BVZERO( &vals[1] );
+ ocs[0] = b->a_group_oc;
+ ocs[1] = NULL;
rc = oc_check_allowed( b->a_group_at->ad_type,
- vals, NULL );
+ ocs, NULL );
if( rc != 0 ) {
char buf[ SLAP_TEXT_BUFLEN ];
char csnbuf[ LDAP_LUTIL_CSNSTR_BUFSIZE ];
Attribute *a;
- a = attr_find( op->ora_e->e_attrs,
- slap_schema.si_ad_structuralObjectClass );
-
- if ( !a ) {
- Attribute *oc;
- int rc;
-
- oc = attr_find( op->ora_e->e_attrs, slap_schema.si_ad_objectClass );
- if ( oc ) {
- rc = structural_class( oc->a_vals, &tmp, NULL, text,
- textbuf, textlen );
- if( rc == LDAP_SUCCESS ) {
- attr_merge_one( op->ora_e,
- slap_schema.si_ad_structuralObjectClass,
- &tmp, NULL );
-
- } else if ( !SLAP_NO_SCHEMA_CHECK( op->o_bd ) &&
- !get_no_schema_check( op ) )
- {
- return rc;
- }
- }
- }
-
if ( SLAP_LASTMOD( op->o_bd ) ) {
char *ptr;
int gotcsn = 0;
ctrls[num_ctrls] = 0;
- /* add opattrs to shadow as well, only missing attrs will actually
- * be added; helps compatibility with older OL versions */
- rs->sr_err = slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
+
+ /* check entry's schema */
+ rs->sr_err = entry_schema_check( op, op->oq_add.rs_e, NULL,
+ get_relax(op), 1, &rs->sr_text, textbuf, textlen );
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
- LDAP_XSTRING(bdb_add) ": entry failed op attrs add: "
+ LDAP_XSTRING(bdb_add) ": entry failed schema check: "
"%s (%d)\n", rs->sr_text, rs->sr_err, 0 );
goto return_results;
}
- /* check entry's schema */
- rs->sr_err = entry_schema_check( op, op->oq_add.rs_e, NULL,
- get_relax(op), &rs->sr_text, textbuf, textlen );
+ /* add opattrs to shadow as well, only missing attrs will actually
+ * be added; helps compatibility with older OL versions */
+ rs->sr_err = slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE,
- LDAP_XSTRING(bdb_add) ": entry failed schema check: "
+ LDAP_XSTRING(bdb_add) ": entry failed op attrs add: "
"%s (%d)\n", rs->sr_text, rs->sr_err, 0 );
goto return_results;
}
}
/* check that the entry still obeys the schema */
- rc = entry_schema_check( op, e, save_attrs, get_relax(op),
+ rc = entry_schema_check( op, e, save_attrs, get_relax(op), 0,
text, textbuf, textlen );
if ( rc != LDAP_SUCCESS || op->o_noop ) {
attrs_free( e->e_attrs );
entry->e_ocflags = 0;
}
/* check that the entry still obeys the schema */
- rc = entry_schema_check( op, entry, NULL, 0,
+ rc = entry_schema_check( op, entry, NULL, 0, 0,
&rs->sr_text, textbuf, sizeof( textbuf ) );
}
Debug( LDAP_DEBUG_TRACE, "ldif_back_add: \"%s\"\n", dn.bv_val, 0, 0);
+ rs->sr_err = entry_schema_check(op, e, NULL, 0, 1,
+ &rs->sr_text, textbuf, sizeof( textbuf ) );
+ if ( rs->sr_err != LDAP_SUCCESS ) goto send_res;
+
rs->sr_err = slap_add_opattrs( op,
&rs->sr_text, textbuf, sizeof( textbuf ), 1 );
if ( rs->sr_err != LDAP_SUCCESS ) goto send_res;
- rs->sr_err = entry_schema_check(op, e, NULL, 0,
- &rs->sr_text, textbuf, sizeof( textbuf ) );
- if ( rs->sr_err != LDAP_SUCCESS ) goto send_res;
-
ldap_pvt_thread_rdwr_wlock(&ni->li_rdwr);
dn2path(&dn, &op->o_bd->be_nsuffix[0], &ni->li_base_path, &leaf_path);
}
/* check that the entry still obeys the schema */
- rc = entry_schema_check( op, e, save_attrs, 0,
+ rc = entry_schema_check( op, e, save_attrs, 0, 0,
&text, textbuf, sizeof( textbuf ) );
if ( rc != LDAP_SUCCESS ) {
rs->sr_err = rc;
Debug( LDAP_DEBUG_TRACE, "==>backsql_add(\"%s\")\n",
op->ora_e->e_name.bv_val, 0, 0 );
- slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
-
/* check schema */
if ( BACKSQL_CHECK_SCHEMA( bi ) ) {
char textbuf[ SLAP_TEXT_BUFLEN ] = { '\0' };
- rs->sr_err = entry_schema_check( op, op->ora_e, NULL, 0,
+ rs->sr_err = entry_schema_check( op, op->ora_e, NULL, 0, 1,
&rs->sr_text, textbuf, sizeof( textbuf ) );
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, " backsql_add(\"%s\"): "
}
}
+ slap_add_opattrs( op, &rs->sr_text, textbuf, textlen, 1 );
+
/* search structuralObjectClass */
for ( at = op->ora_e->e_attrs; at != NULL; at = at->a_next ) {
if ( at->a_desc == slap_schema.si_ad_structuralObjectClass ) {
}
rs->sr_err = structural_class( at->a_vals, &scname, NULL,
- &text, buf, sizeof( buf ) );
+ &text, buf, sizeof( buf ), op->o_tmpmemctx );
if ( rs->sr_err != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, " backsql_add(\"%s\"): "
"%s (%d)\n",
}
rc = structural_class( nvals, &soc, NULL,
- &text, textbuf, textlen );
+ &text, textbuf, textlen, op->o_tmpmemctx );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_TRACE, "backsql_id2entry(%s): "
"structural_class() failed %d (%s)\n",
goto do_transact;
}
- rs->sr_err = entry_schema_check( op, &m, NULL, 0,
+ rs->sr_err = entry_schema_check( op, &m, NULL, 0, 0,
&rs->sr_text, textbuf, sizeof( textbuf ) );
if ( rs->sr_err != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_TRACE, " backsql_add(\"%s\"): "
+ Debug( LDAP_DEBUG_TRACE, " backsql_modify(\"%s\"): "
"entry failed schema check -- aborting\n",
m.e_name.bv_val, 0, 0 );
e = NULL;
e_id = bsi.bsi_base_id;
- rs->sr_err = entry_schema_check( op, &r, NULL, 0,
+ rs->sr_err = entry_schema_check( op, &r, NULL, 0, 0,
&rs->sr_text, textbuf, sizeof( textbuf ) );
if ( rs->sr_err != LDAP_SUCCESS ) {
- Debug( LDAP_DEBUG_TRACE, " backsql_add(\"%s\"): "
+ Debug( LDAP_DEBUG_TRACE, " backsql_modrdn(\"%s\"): "
"entry failed schema check -- aborting\n",
r.e_name.bv_val, 0, 0 );
e = NULL;
if(rc == LDAP_SUCCESS) {
/* check that the entry still obeys the schema */
- rc = entry_schema_check(op, e, NULL, 0,
+ rc = entry_schema_check(op, e, NULL, 0, 0,
&rs->sr_text, ca->msg, sizeof(ca->msg) );
}
if ( rc == LDAP_SUCCESS ) {
}
oc_at = attr_find( e->e_attrs, slap_schema.si_ad_objectClass );
- rc = structural_class(oc_at->a_vals, &val, NULL, &text, c->msg,
- sizeof(c->msg));
- attr_merge_normalize_one(e, slap_schema.si_ad_structuralObjectClass, &val, NULL );
- if ( op ) {
+ rc = structural_class(oc_at->a_vals, &oc, NULL, &text, c->msg,
+ sizeof(c->msg), op->o_tmpmemctx );
+ attr_merge_normalize_one(e, slap_schema.si_ad_structuralObjectClass, &oc->soc_cname, NULL );
+ if ( !op->o_noop ) {
op->ora_e = e;
op->o_bd->be_add( op, rs );
if ( ( rs->sr_err != LDAP_SUCCESS )
return config_check_schema( cfb );
}
- if ( cfb->cb_use_ldif ) {
- thrctx = ldap_pvt_thread_pool_context();
- op = (Operation *) &opbuf;
- connection_fake_init( &conn, op, thrctx );
+ thrctx = ldap_pvt_thread_pool_context();
+ op = (Operation *) &opbuf;
+ connection_fake_init( &conn, op, thrctx );
- op->o_tag = LDAP_REQ_ADD;
- op->o_callback = &cb;
- op->o_bd = &cfb->cb_db;
- op->o_dn = op->o_bd->be_rootdn;
- op->o_ndn = op->o_bd->be_rootndn;
- } else {
- op = NULL;
+ op->o_tag = LDAP_REQ_ADD;
+ op->o_callback = &cb;
+ op->o_bd = &cfb->cb_db;
+ op->o_dn = op->o_bd->be_rootdn;
+ op->o_ndn = op->o_bd->be_rootndn;
+
+ if ( !cfb->cb_use_ldif ) {
+ op->o_noop = 1;
}
/* create root of tree */
#endif /* PRESERVE_ORDER */
cv = ml->sml_nvalues ? ml->sml_nvalues : ml->sml_values;
+ if ( ad == slap_schema.si_ad_objectClass )
+ mr = NULL; /* shortcut matching */
/* record indices to preserve input ordering */
ix = slap_sl_malloc( nvals * sizeof(int), ctx );
*/
LDAP_SLAPD_F( int ) oc_check_allowed(
AttributeType *type,
- BerVarray oclist,
+ ObjectClass **socs,
ObjectClass *sc );
LDAP_SLAPD_F( int ) structural_class(
BerVarray ocs,
- struct berval *scbv,
ObjectClass **sc,
+ ObjectClass ***socs,
const char **text,
- char *textbuf, size_t textlen );
+ char *textbuf, size_t textlen, void *ctx );
LDAP_SLAPD_F( int ) entry_schema_check(
Operation *op,
Entry *e,
Attribute *attrs,
int manage,
+ int add_soc,
const char** text,
char *textbuf, size_t textlen );
Modifications *mods,
struct berval *oc,
const char** text,
- char *textbuf, size_t textlen );
+ char *textbuf, size_t textlen, void *ctx );
/*
* schema_init.c
Entry *e,
Attribute *oldattrs,
int manage,
+ int add_soc,
const char** text,
char *textbuf, size_t textlen )
{
- Attribute *a, *asc, *aoc;
- ObjectClass *sc, *oc;
+ Attribute *a, *asc = NULL, *aoc = NULL;
+ ObjectClass *sc, *oc, **socs = NULL;
AttributeType *at;
ContentRule *cr;
int rc, i;
- struct berval nsc;
AttributeDescription *ad_structuralObjectClass
= slap_schema.si_ad_structuralObjectClass;
AttributeDescription *ad_objectClass
assert( a->a_vals[0].bv_val != NULL );
if( a->a_desc->ad_type->sat_check ) {
- int rc = (a->a_desc->ad_type->sat_check)(
+ rc = (a->a_desc->ad_type->sat_check)(
op->o_bd, e, a, text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
return rc;
}
}
+ if( a->a_desc == ad_structuralObjectClass )
+ asc = a;
+ else if ( a->a_desc == ad_objectClass )
+ aoc = a;
+
if( !collectiveSubentry && is_at_collective( a->a_desc->ad_type ) ) {
snprintf( textbuf, textlen,
"'%s' can only appear in collectiveAttributeSubentry",
}
}
- /* find the structural object class attribute */
- asc = attr_find( e->e_attrs, ad_structuralObjectClass );
- if ( asc == NULL ) {
+ /* check the object class attribute */
+ if ( aoc == NULL ) {
+ Debug( LDAP_DEBUG_ANY, "No objectClass for entry (%s)\n",
+ e->e_dn, 0, 0 );
+
+ *text = "no objectClass attribute";
+ return LDAP_OBJECT_CLASS_VIOLATION;
+ }
+
+ assert( aoc->a_vals != NULL );
+ assert( aoc->a_vals[0].bv_val != NULL );
+
+ /* check the structural object class attribute */
+ if ( asc == NULL && !add_soc ) {
Debug( LDAP_DEBUG_ANY,
"No structuralObjectClass for entry (%s)\n",
e->e_dn, 0, 0 );
return LDAP_OTHER;
}
+ rc = structural_class( aoc->a_vals, &oc, &socs, text, textbuf, textlen,
+ op->o_tmpmemctx );
+ if( rc != LDAP_SUCCESS ) {
+ return rc;
+ }
+
+ if ( asc == NULL && add_soc ) {
+ attr_merge_one( e, ad_structuralObjectClass, &oc->soc_cname, NULL );
+ asc = attr_find( e->e_attrs, ad_structuralObjectClass );
+ sc = oc;
+ goto got_soc;
+ }
+
assert( asc->a_vals != NULL );
assert( asc->a_vals[0].bv_val != NULL );
assert( asc->a_vals[1].bv_val == NULL );
return LDAP_OTHER;
}
+got_soc:
if( !manage && sc->soc_obsolete ) {
snprintf( textbuf, textlen,
"structuralObjectClass '%s' is OBSOLETE",
return LDAP_OBJECT_CLASS_VIOLATION;
}
- /* find the object class attribute */
- aoc = attr_find( e->e_attrs, ad_objectClass );
- if ( aoc == NULL ) {
- Debug( LDAP_DEBUG_ANY, "No objectClass for entry (%s)\n",
- e->e_dn, 0, 0 );
-
- *text = "no objectClass attribute";
- return LDAP_OBJECT_CLASS_VIOLATION;
- }
-
- assert( aoc->a_vals != NULL );
- assert( aoc->a_vals[0].bv_val != NULL );
-
- rc = structural_class( aoc->a_vals, &nsc, &oc, text, textbuf, textlen );
- if( rc != LDAP_SUCCESS ) {
- return rc;
- }
-
*text = textbuf;
if ( oc == NULL ) {
snprintf( textbuf, textlen,
"unrecognized objectClass '%s'",
aoc->a_vals[0].bv_val );
- return LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ goto leave;
} else if ( sc != slap_schema.si_oc_glue && sc != oc ) {
snprintf( textbuf, textlen,
"structural object class modification "
"from '%s' to '%s' not allowed",
- asc->a_vals[0].bv_val, nsc.bv_val );
- return LDAP_NO_OBJECT_CLASS_MODS;
+ asc->a_vals[0].bv_val, oc->soc_cname.bv_val );
+ rc = LDAP_NO_OBJECT_CLASS_MODS;
+ goto leave;
} else if ( sc == slap_schema.si_oc_glue ) {
sc = oc;
}
/* naming check */
- if ( !is_entry_objectclass ( e, slap_schema.si_oc_glue, 0 ) ) {
+ if ( !is_entry_glue ( e ) ) {
rc = entry_naming_check( e, manage, text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
- return rc;
+ goto leave;
}
} else {
/* Glue Entry */
"Entry (%s): %s\n",
e->e_dn, textbuf, 0 );
- return LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ goto leave;
}
if( cr->scr_required ) for( i=0; cr->scr_required[i]; i++ ) {
"Entry (%s): %s\n",
e->e_dn, textbuf, 0 );
- return LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ goto leave;
}
}
"Entry (%s): %s\n",
e->e_dn, textbuf, 0 );
- return LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ goto leave;
}
}
}
/* check that the entry has required attrs for each oc */
- for ( i = 0; aoc->a_vals[i].bv_val != NULL; i++ ) {
- if ( (oc = oc_bvfind( &aoc->a_vals[i] )) == NULL ) {
- snprintf( textbuf, textlen,
- "unrecognized objectClass '%s'",
- aoc->a_vals[i].bv_val );
-
- Debug( LDAP_DEBUG_ANY,
- "entry_check_schema(%s): %s\n",
- e->e_dn, textbuf, 0 );
-
- return LDAP_OBJECT_CLASS_VIOLATION;
- }
-
+ for ( i = 0; socs[i]; i++ ) {
+ oc = socs[i];
if ( !manage && oc->soc_obsolete ) {
/* disallow obsolete classes */
snprintf( textbuf, textlen,
"entry_check_schema(%s): %s\n",
e->e_dn, textbuf, 0 );
- return LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ goto leave;
}
if ( oc->soc_check ) {
- int rc = (oc->soc_check)( op->o_bd, e, oc,
+ rc = (oc->soc_check)( op->o_bd, e, oc,
text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
- return rc;
+ goto leave;
}
}
{
int j;
ObjectClass *xc = NULL;
- for( j=0; aoc->a_vals[j].bv_val; j++ ) {
+ for( j=0; socs[j]; j++ ) {
if( i != j ) {
- xc = oc_bvfind( &aoc->a_vals[i] );
- if( xc == NULL ) {
- snprintf( textbuf, textlen,
- "unrecognized objectClass '%s'",
- aoc->a_vals[i].bv_val );
-
- Debug( LDAP_DEBUG_ANY,
- "entry_check_schema(%s): %s\n",
- e->e_dn, textbuf, 0 );
-
- return LDAP_OBJECT_CLASS_VIOLATION;
- }
+ xc = socs[j];
/* since we previous check against the
* structural object of this entry, the
"entry_check_schema(%s): %s\n",
e->e_dn, textbuf, 0 );
- return LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ goto leave;
}
}
"Entry (%s): %s\n",
e->e_dn, textbuf, 0 );
- return LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ goto leave;
}
}
"Entry (%s): %s\n",
e->e_dn, textbuf, 0 );
- return LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
+ goto leave;
}
if( oc == slap_schema.si_oc_extensibleObject ) {
if( extensible ) {
*text = NULL;
- return LDAP_SUCCESS;
+ rc = LDAP_SUCCESS;
+ goto leave;
}
/* check that each attr in the entry is allowed by some oc */
for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
- int ret;
-
- ret = LDAP_OBJECT_CLASS_VIOLATION;
+ rc = LDAP_OBJECT_CLASS_VIOLATION;
if( cr && cr->scr_required ) {
for( i=0; cr->scr_required[i]; i++ ) {
if( cr->scr_required[i] == a->a_desc->ad_type ) {
- ret = LDAP_SUCCESS;
+ rc = LDAP_SUCCESS;
break;
}
}
}
- if( ret != LDAP_SUCCESS && cr && cr->scr_allowed ) {
+ if( rc != LDAP_SUCCESS && cr && cr->scr_allowed ) {
for( i=0; cr->scr_allowed[i]; i++ ) {
if( cr->scr_allowed[i] == a->a_desc->ad_type ) {
- ret = LDAP_SUCCESS;
+ rc = LDAP_SUCCESS;
break;
}
}
}
- if( ret != LDAP_SUCCESS )
+ if( rc != LDAP_SUCCESS )
{
- ret = oc_check_allowed( a->a_desc->ad_type, aoc->a_vals, sc );
+ rc = oc_check_allowed( a->a_desc->ad_type, socs, sc );
}
- if ( ret != LDAP_SUCCESS ) {
+ if ( rc != LDAP_SUCCESS ) {
char *type = a->a_desc->ad_cname.bv_val;
snprintf( textbuf, textlen,
"Entry (%s), %s\n",
e->e_dn, textbuf, 0 );
- return ret;
+ goto leave;
}
}
*text = NULL;
- return LDAP_SUCCESS;
+leave:
+ slap_sl_free( socs, op->o_tmpmemctx );
+ return rc;
}
static char *
int oc_check_allowed(
AttributeType *at,
- BerVarray ocl,
+ ObjectClass **socs,
ObjectClass *sc )
{
int i, j;
}
/* check that the type appears as req or opt in at least one oc */
- for ( i = 0; ocl[i].bv_val != NULL; i++ ) {
+ for ( i = 0; socs[i]; i++ ) {
/* if we know about the oc */
- ObjectClass *oc = oc_bvfind( &ocl[i] );
+ ObjectClass *oc = socs[i];
if ( oc != NULL && oc->soc_kind != LDAP_SCHEMA_ABSTRACT &&
( sc == NULL || oc->soc_kind == LDAP_SCHEMA_AUXILIARY ))
{
*/
int structural_class(
BerVarray ocs,
- struct berval *scbv,
ObjectClass **scp,
+ ObjectClass ***socsp,
const char **text,
- char *textbuf, size_t textlen )
+ char *textbuf, size_t textlen,
+ void *ctx )
{
- int i;
- ObjectClass *oc;
+ int i, nocs;
+ ObjectClass *oc, **socs;
ObjectClass *sc = NULL;
int scn = -1;
*text = "structural_class: internal error";
- scbv->bv_len = 0;
+
+ /* count them */
+ for( i=0; ocs[i].bv_val; i++ ) ;
+ nocs = i;
+
+ socs = slap_sl_malloc( (nocs+1) * sizeof(ObjectClass *), ctx );
for( i=0; ocs[i].bv_val; i++ ) {
- oc = oc_bvfind( &ocs[i] );
+ socs[i] = oc_bvfind( &ocs[i] );
- if( oc == NULL ) {
+ if( socs[i] == NULL ) {
snprintf( textbuf, textlen,
"unrecognized objectClass '%s'",
ocs[i].bv_val );
*text = textbuf;
- return LDAP_OBJECT_CLASS_VIOLATION;
+ goto fail;
}
+ }
+ socs[i] = NULL;
+ for( i=0; ocs[i].bv_val; i++ ) {
+ oc = socs[i];
if( oc->soc_kind == LDAP_SCHEMA_STRUCTURAL ) {
if( sc == NULL || is_object_subclass( sc, oc ) ) {
sc = oc;
/* find common superior */
for( j=i+1; ocs[j].bv_val; j++ ) {
- xc = oc_bvfind( &ocs[j] );
+ xc = socs[j];
if( xc == NULL ) {
snprintf( textbuf, textlen,
"unrecognized objectClass '%s'",
ocs[j].bv_val );
*text = textbuf;
- return LDAP_OBJECT_CLASS_VIOLATION;
+ goto fail;
}
if( xc->soc_kind != LDAP_SCHEMA_STRUCTURAL ) {
"invalid structural object class chain (%s/%s)",
ocs[scn].bv_val, ocs[i].bv_val );
*text = textbuf;
- return LDAP_OBJECT_CLASS_VIOLATION;
+ goto fail;
}
}
}
if( sc == NULL ) {
*text = "no structural object class provided";
- return LDAP_OBJECT_CLASS_VIOLATION;
+ goto fail;
}
if( scn < 0 ) {
*text = "invalid structural object class";
- return LDAP_OBJECT_CLASS_VIOLATION;
+ goto fail;
}
- *scbv = ocs[scn];
-
- if( scbv->bv_len == 0 ) {
- *text = "invalid structural object class";
- return LDAP_OBJECT_CLASS_VIOLATION;
+ if ( socsp ) {
+ *socsp = socs;
+ } else {
+ slap_sl_free( socs, ctx );
}
-
*text = NULL;
return LDAP_SUCCESS;
+
+fail:
+ slap_sl_free( socs, ctx );
+ return LDAP_OBJECT_CLASS_VIOLATION;
}
/*
Modifications *mods,
struct berval *sc,
const char **text,
- char *textbuf, size_t textlen )
+ char *textbuf, size_t textlen, void *ctx )
{
Modifications *ocmod = NULL;
+ ObjectClass *ssc;
+ int rc;
for( ; mods != NULL; mods = mods->sml_next ) {
if( mods->sml_desc == slap_schema.si_ad_objectClass ) {
return LDAP_OBJECT_CLASS_VIOLATION;
}
- return structural_class( ocmod->sml_values, sc, NULL,
- text, textbuf, textlen );
+ rc = structural_class( ocmod->sml_values, &ssc, NULL,
+ text, textbuf, textlen, ctx );
+ if ( rc == LDAP_SUCCESS )
+ *sc = ssc->soc_cname;
+ return rc;
}
{
int rc, noc, i;
BerVarray ocvalues;
+ ObjectClass **socs;
for( noc=0; values[noc].bv_val != NULL; noc++ ) {
/* just count em */;
}
/* over allocate */
- ocvalues = slap_sl_malloc( sizeof( struct berval ) * (noc+16), ctx );
+ socs = slap_sl_malloc( (noc+16) * sizeof( ObjectClass * ), ctx );
- /* copy listed values (and termination) */
+ /* initialize */
for( i=0; i<noc; i++ ) {
- ObjectClass *oc = oc_bvfind( &values[i] );
- if( oc ) {
- ocvalues[i] = oc->soc_cname;
- } else {
- ocvalues[i] = values[i];
- }
+ socs[i] = oc_bvfind( &values[i] );
}
- ocvalues[i].bv_val = NULL;
- ocvalues[i].bv_len = 0;
-
/* expand values */
for( i=0; i<noc; i++ ) {
int j;
- ObjectClass *oc = oc_bvfind( &ocvalues[i] );
+ ObjectClass *oc = socs[i];
if( oc == NULL || oc->soc_sups == NULL ) continue;
for( j=0; oc->soc_sups[j] != NULL; j++ ) {
int k;
for( k=0; k<noc; k++ ) {
- if( bvmatch( &ocvalues[k], &sup->soc_cname ) ) {
+ if( sup == socs[k] ) {
found++;
break;
}
}
if( !found ) {
- ocvalues = slap_sl_realloc( ocvalues,
- sizeof( struct berval ) * (noc+2), ctx );
+ socs = slap_sl_realloc( socs,
+ sizeof( ObjectClass * ) * (noc+2), ctx );
assert( k == noc );
-
- ocvalues[noc] = sup->soc_cname;
-
- assert( ocvalues[noc].bv_val != NULL );
- assert( ocvalues[noc].bv_len != 0 );
-
- noc++;
-
- ocvalues[noc].bv_len = 0;
- ocvalues[noc].bv_val = NULL;
+ socs[noc++] = sup;
}
}
}
+ ocvalues = slap_sl_malloc( sizeof( struct berval ) * (noc+1), ctx );
+ /* copy values */
+ for( i=0; i<noc; i++ ) {
+ if ( socs[i] )
+ ocvalues[i] = socs[i]->soc_cname;
+ else
+ ocvalues[i] = values[i];
+ }
+ BER_BVZERO( &ocvalues[i] );
+
rc = octetStringIndexer( use, mask, syntax, mr,
prefix, ocvalues, keysp, ctx );
slap_sl_free( ocvalues, ctx );
+ slap_sl_free( socs, ctx );
return rc;
}
memset( &opbuf, 0, sizeof(opbuf) );
op = (Operation *) &opbuf;
+ op->o_hdr = (Opheader *)(op+1);
if( !be->be_entry_open ||
!be->be_entry_close ||
}
{
- Attribute *sc = attr_find( e->e_attrs,
- slap_schema.si_ad_structuralObjectClass );
Attribute *oc = attr_find( e->e_attrs,
slap_schema.si_ad_objectClass );
break;
}
- if( sc == NULL ) {
- struct berval val;
-
- rc = structural_class( oc->a_vals, &val,
- NULL, &text, textbuf, textlen );
-
- if( rc != LDAP_SUCCESS ) {
- fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
- progname, e->e_dn, lineno, rc, text );
- rc = EXIT_FAILURE;
- entry_free( e );
- if( continuemode ) continue;
- break;
- }
-
- attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
- &val, NULL );
- }
-
/* check schema */
op->o_bd = be;
if ( (slapMode & SLAP_TOOL_NO_SCHEMA_CHECK) == 0) {
- rc = entry_schema_check( op, e, NULL, manage,
+ rc = entry_schema_check( op, e, NULL, manage, 1,
&text, textbuf, textlen );
if( rc != LDAP_SUCCESS ) {
rc = mods_structural_class( pb->pb_op->ora_modlist,
&tmpval, &pb->pb_rs->sr_text,
- pb->pb_textbuf, sizeof( pb->pb_textbuf ));
+ pb->pb_textbuf, sizeof( pb->pb_textbuf ),
+ pb->pb_op->o_tmpmemctx );
*((char **)value) = tmpval.bv_val;
} else {
rc = PBLOCK_ERROR;
pb->pb_op->o_bd = select_backend( &e->e_nname, 0, 0 );
if ( pb->pb_op->o_bd != NULL ) {
- rc = entry_schema_check( pb->pb_op, e, NULL, 0,
+ rc = entry_schema_check( pb->pb_op, e, NULL, 0, 0,
&text, textbuf, textlen );
}
pb->pb_op->o_bd = be_orig;
projects / thirdparty / openldap.git / commitdiff
