= slap_schema.si_ad_objectClass;
Entry *e;
- struct berval vals[2];
-
- vals[1].bv_val = NULL;
+ struct berval vals[5];
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
e->e_attrs = NULL;
- ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1, &e->e_name);
- (void) dnNormalize2( NULL, &e->e_name, &e->e_nname );
+ /* backend-specific schema info should be created by the
+ * backend itself
+ */
+ ber_dupbv( &e->e_name, &global_schemadn );
+ ber_dupbv( &e->e_nname, &global_schemandn );
e->e_private = NULL;
vals[0].bv_val = "subentry";
vals[0].bv_len = sizeof("subentry")-1;
- attr_merge( e, ad_structuralObjectClass, vals );
+ attr_merge_one( e, ad_structuralObjectClass, vals );
vals[0].bv_val = "top";
vals[0].bv_len = sizeof("top")-1;
- attr_merge( e, ad_objectClass, vals );
-
- vals[0].bv_val = "subentry";
- vals[0].bv_len = sizeof("subentry")-1;
- attr_merge( e, ad_objectClass, vals );
-
- vals[0].bv_val = "subschema";
- vals[0].bv_len = sizeof("subschema")-1;
- attr_merge( e, ad_objectClass, vals );
-
- vals[0].bv_val = "extensibleObject";
- vals[0].bv_len = sizeof("extensibleObject")-1;
+ vals[1].bv_val = "subentry";
+ vals[1].bv_len = sizeof("subentry")-1;
+ vals[2].bv_val = "subschema";
+ vals[2].bv_len = sizeof("subschema")-1;
+ vals[3].bv_val = "extensibleObject";
+ vals[3].bv_len = sizeof("extensibleObject")-1;
+ vals[4].bv_val = NULL;
attr_merge( e, ad_objectClass, vals );
{
int rc;
AttributeDescription *desc = NULL;
- struct berval rdn = { sizeof(SLAPD_SCHEMA_DN)-1,
- SLAPD_SCHEMA_DN };
+ struct berval rdn = global_schemadn;
vals[0].bv_val = strchr( rdn.bv_val, '=' );
if( vals[0].bv_val == NULL ) {
return LDAP_OTHER;
}
- attr_merge( e, desc, vals );
+ attr_merge_one( e, desc, vals );
}
if ( syn_schema_info( e )
|| mr_schema_info( e )
+ || mru_schema_info( e )
|| at_schema_info( e )
|| oc_schema_info( e ) )
{