/* schema.c - routines to manage schema definitions */
/* $OpenLDAP$ */
/*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
* COPYING RESTRICTIONS APPLY, see COPYRIGHT file
*/
#if defined( SLAPD_SCHEMA_DN )
int
-schema_info( Entry **entry, char **text )
+schema_info( Entry **entry, const char **text )
{
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- AttributeDescription *ad_objectClass = slap_schema.si_ad_objectClass;
-#else
- char *ad_objectClass = "objectClass";
-#endif
+ AttributeDescription *ad_structuralObjectClass
+ = slap_schema.si_ad_structuralObjectClass;
+ AttributeDescription *ad_objectClass
+ = slap_schema.si_ad_objectClass;
Entry *e;
- struct berval val;
- struct berval *vals[2];
+ struct berval vals[2];
- vals[0] = &val;
- vals[1] = NULL;
+ vals[1].bv_val = NULL;
e = (Entry *) ch_calloc( 1, sizeof(Entry) );
e->e_attrs = NULL;
- e->e_dn = ch_strdup( SLAPD_SCHEMA_DN );
- e->e_ndn = ch_strdup( SLAPD_SCHEMA_DN );
- (void) dn_normalize( e->e_ndn );
+ ber_str2bv( SLAPD_SCHEMA_DN, sizeof(SLAPD_SCHEMA_DN)-1, 1, &e->e_name);
+ (void) dnNormalize2( NULL, &e->e_name, &e->e_nname );
e->e_private = NULL;
- val.bv_val = "top";
- val.bv_len = sizeof("top")-1;
+ vals[0].bv_val = "subentry";
+ vals[0].bv_len = sizeof("subentry")-1;
+ attr_merge( e, ad_structuralObjectClass, vals );
+
+ vals[0].bv_val = "top";
+ vals[0].bv_len = sizeof("top")-1;
attr_merge( e, ad_objectClass, vals );
- val.bv_val = "LDAPsubentry";
- val.bv_len = sizeof("LDAPsubentry")-1;
+ vals[0].bv_val = "subentry";
+ vals[0].bv_len = sizeof("subentry")-1;
attr_merge( e, ad_objectClass, vals );
- val.bv_val = "subschema";
- val.bv_len = sizeof("subschema")-1;
+ vals[0].bv_val = "subschema";
+ vals[0].bv_len = sizeof("subschema")-1;
attr_merge( e, ad_objectClass, vals );
- val.bv_val = "extensibleObject";
- val.bv_len = sizeof("extensibleObject")-1;
+ vals[0].bv_val = "extensibleObject";
+ vals[0].bv_len = sizeof("extensibleObject")-1;
attr_merge( e, ad_objectClass, vals );
{
int rc;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
AttributeDescription *desc = NULL;
-#else
- char *desc;
-#endif
- char *rdn = ch_strdup( SLAPD_SCHEMA_DN );
- val.bv_val = strchr( rdn, '=' );
+ struct berval rdn = { sizeof(SLAPD_SCHEMA_DN)-1,
+ SLAPD_SCHEMA_DN };
+ vals[0].bv_val = strchr( rdn.bv_val, '=' );
- if( val.bv_val == NULL ) {
- free( rdn );
+ if( vals[0].bv_val == NULL ) {
*text = "improperly configured subschema subentry";
return LDAP_OTHER;
}
- *val.bv_val = '\0';
- val.bv_len = strlen( ++val.bv_val );
+ vals[0].bv_val++;
+ vals[0].bv_len = rdn.bv_len - (vals[0].bv_val - rdn.bv_val);
+ rdn.bv_len -= vals[0].bv_len + 1;
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rc = slap_str2ad( rdn, &desc, text );
+ rc = slap_bv2ad( &rdn, &desc, text );
if( rc != LDAP_SUCCESS ) {
- free( rdn );
entry_free( e );
*text = "improperly configured subschema subentry";
return LDAP_OTHER;
}
-#else
- desc = rdn;
-#endif
attr_merge( e, desc, vals );
- free( rdn );
}
if ( syn_schema_info( e )
|| mr_schema_info( e )
+ || mru_schema_info( e )
|| at_schema_info( e )
|| oc_schema_info( e ) )
{
/* Out of memory, do something about it */
entry_free( e );
- text = "out of memory";
+ *text = "out of memory";
return LDAP_OTHER;
}
return LDAP_SUCCESS;
}
#endif
-