Fix previous commit

[openldap] / servers / slapd / schema_check.c

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index fb6ba5275d39a74bcf0bb9286c3fca18df20f587..072460282d0532f0dca19e5dc7ca4ff2f2ea25c8 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -48,7 +48,7 @@ entry_schema_check(
        int subentry = is_entry_subentry( e );
        int collectiveSubentry = 0;
 
-       if( subentry) collectiveSubentry = is_entry_collectiveAttributes( e );
+       if( subentry) collectiveSubentry = is_entry_collectiveAttributeSubentry( e );
 
        *text = textbuf;
 
@@ -70,7 +70,7 @@ entry_schema_check(
 
                if( !collectiveSubentry && is_at_collective( a->a_desc->ad_type ) ) {
                        snprintf( textbuf, textlen,
-                               "'%s' can only appear in collectiveAttributes subentry",
+                               "'%s' can only appear in collectiveAttributeSubentry",
                                type );
                        return LDAP_OBJECT_CLASS_VIOLATION;
                }
@@ -219,8 +219,8 @@ entry_schema_check(
                        return LDAP_OBJECT_CLASS_VIOLATION;
                }
 
-               if ( oc->sco_check ) {
-                       int rc = (oc->sco_check)( be, e, oc,
+               if ( oc->soc_check ) {
+                       int rc = (oc->soc_check)( be, e, oc,
                                text, textbuf, textlen );
                        if( rc != LDAP_SUCCESS ) {
                                return rc;
@@ -394,7 +394,7 @@ oc_check_required(
 
 int oc_check_allowed(
        AttributeType *at,
-       BVarray ocl,
+       BerVarray ocl,
        ObjectClass *sc )
 {
        int             i, j;
@@ -475,7 +475,7 @@ int oc_check_allowed(
  * Determine the structural object class from a set of OIDs
  */
 int structural_class(
-       BVarray ocs,
+       BerVarray ocs,
        struct berval *scbv,
        ObjectClass **scp,
        const char **text,