Experiment with busy loop protection...

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 4dc42d6617840260c9b4440212fd25fa7cb9e810..f56ca4deffbdc1fe0e6aa4924258810e20f3784f 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -19,14 +19,10 @@
 
 #if defined( SLAPD_SCHEMA_DN )
 
-void
-schema_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
+int
+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;
@@ -60,40 +56,28 @@ schema_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
        attr_merge( e, ad_objectClass, vals );
 
        {
-#ifdef SLAPD_SCHEMA_NOT_COMPAT
                int rc;
-               char *text;
                AttributeDescription *desc = NULL;
-#else
-               char *desc;
-#endif
                char *rdn = ch_strdup( SLAPD_SCHEMA_DN );
                val.bv_val = strchr( rdn, '=' );
 
                if( val.bv_val == NULL ) {
-                       send_ldap_result( conn, op, LDAP_OTHER,
-                               NULL, "improperly configured subschema subentry",
-                               NULL, NULL );
                        free( rdn );
-                       return;
+                       *text = "improperly configured subschema subentry";
+                       return LDAP_OTHER;
                }
 
                *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 ) {
-                       send_ldap_result( conn, op, LDAP_OTHER,
-                               NULL, "improperly configured subschema subentry",
-                               NULL, NULL );
                        free( rdn );
-                       return;
+                       entry_free( e );
+                       *text = "improperly configured subschema subentry";
+                       return LDAP_OTHER;
                }
-#else
-               desc = rdn;
-#endif
 
                attr_merge( e, desc, vals );
                free( rdn );
@@ -106,17 +90,12 @@ schema_info( Connection *conn, Operation *op, char **attrs, int attrsonly )
        {
                /* Out of memory, do something about it */
                entry_free( e );
-               send_ldap_result( conn, op, LDAP_OTHER,
-                       NULL, "out of memory", NULL, NULL );
-               return;
+               *text = "out of memory";
+               return LDAP_OTHER;
        }
        
-       send_search_entry( &backends[0], conn, op,
-               e, attrs, attrsonly, NULL );
-       send_search_result( conn, op, LDAP_SUCCESS,
-               NULL, NULL, NULL, NULL, 1 );
-
-       entry_free( e );
+       *entry = e;
+       return LDAP_SUCCESS;
 }
 #endif