#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
Entry *e;
struct berval val;
{
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, '=' );
*val.bv_val = '\0';
val.bv_len = strlen( ++val.bv_val );
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
- rc = slap_str2ad( rdn, &desc, &text );
+ rc = slap_str2ad( rdn, &desc, text );
if( rc != LDAP_SUCCESS ) {
free( rdn );
*text = "improperly configured subschema subentry";
return LDAP_OTHER;
}
-#else
- desc = rdn;
-#endif
attr_merge( e, desc, vals );
free( rdn );
{
/* Out of memory, do something about it */
entry_free( e );
- text = "out of memory";
+ *text = "out of memory";
return LDAP_OTHER;
}