- setup framework for monitoring of back-bdb/back-hdb stuff in their

[openldap] / servers / slapd / schema.c

diff --git a/servers/slapd/schema.c b/servers/slapd/schema.c
index 7dd42ddf0774f3fc54024c61f75ee3fa4aa51691..403dac0cdfa9f7adfd83f3e245f03b798f67ef01 100644 (file)
--- a/servers/slapd/schema.c
+++ b/servers/slapd/schema.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -42,11 +42,11 @@ schema_info( Entry **entry, const char **text )
        struct berval   vals[5];
        struct berval   nvals[5];
 
-       e = (Entry *) SLAP_CALLOC( 1, sizeof(Entry) );
+       e = entry_alloc();
        if( e == NULL ) {
                /* Out of memory, do something about it */
                Debug( LDAP_DEBUG_ANY, 
-                       "schema_info: SLAP_CALLOC failed - out of memory.\n", 0, 0, 0 );
+                       "schema_info: entry_alloc failed - out of memory.\n", 0, 0, 0 );
                *text = "out of memory";
                return LDAP_OTHER;
        }
@@ -83,7 +83,7 @@ schema_info( Entry **entry, const char **text )
                int rc;
                AttributeDescription *desc = NULL;
                struct berval rdn = frontendDB->be_schemadn;
-               vals[0].bv_val = strchr( rdn.bv_val, '=' );
+               vals[0].bv_val = ber_bvchr( &rdn, '=' );
 
                if( vals[0].bv_val == NULL ) {
                        *text = "improperly configured subschema subentry";
@@ -102,7 +102,7 @@ schema_info( Entry **entry, const char **text )
                        return LDAP_OTHER;
                }
 
-               nvals[0].bv_val = strchr( frontendDB->be_schemandn.bv_val, '=' );
+               nvals[0].bv_val = ber_bvchr( &frontendDB->be_schemandn, '=' );
                assert( nvals[0].bv_val != NULL );
                nvals[0].bv_val++;
                nvals[0].bv_len = frontendDB->be_schemandn.bv_len -