Do something with the error text.

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 55ee96c92b0b840665ff2d7d9c5bc82c6e6e1831..f56ca4deffbdc1fe0e6aa4924258810e20f3784f 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -20,13 +20,9 @@
 #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;
@@ -61,11 +57,7 @@ schema_info( Entry **entry, char **text )
 
        {
                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, '=' );
 
@@ -78,8 +70,7 @@ schema_info( Entry **entry, char **text )
                *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 );
@@ -87,9 +78,6 @@ schema_info( Entry **entry, char **text )
                        *text = "improperly configured subschema subentry";
                        return LDAP_OTHER;
                }
-#else
-               desc = rdn;
-#endif
 
                attr_merge( e, desc, vals );
                free( rdn );
@@ -102,7 +90,7 @@ schema_info( Entry **entry, char **text )
        {
                /* Out of memory, do something about it */
                entry_free( e );
-               text = "out of memory";
+               *text = "out of memory";
                return LDAP_OTHER;
        }