remove dbenv->lock_put() call from transaction-protected operations

[openldap] / servers / slapd / schema_check.c

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index 8e81ea0e3561bf7966627a27c6ec21351e5f76fa..405a47e54801f9fdccd0930b18bc941ded277171 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;
                }
@@ -163,7 +163,7 @@ entry_schema_check(
        if ( aoc == NULL ) {
 #ifdef NEW_LOGGING
                LDAP_LOG(( "schema", LDAP_LEVEL_INFO,
-                       "entry_schema_check: No objectClass for entry (%s).\n"
+                       "entry_schema_check: No objectClass for entry (%s).\n",
                        e->e_dn ));
 #else
                Debug( LDAP_DEBUG_ANY, "No objectClass for entry (%s)\n",
@@ -494,7 +494,7 @@ int structural_class(
 
                if( oc == NULL ) {
                        snprintf( textbuf, textlen,
-                               "unrecongized objectClass '%s'",
+                               "unrecognized objectClass '%s'",
                                ocs[i].bv_val );
                        *text = textbuf;
                        return LDAP_OBJECT_CLASS_VIOLATION;
@@ -515,7 +515,7 @@ int structural_class(
 
                                        if( xc == NULL ) {
                                                snprintf( textbuf, textlen,
-                                                       "unrecongized objectClass '%s'",
+                                                       "unrecognized objectClass '%s'",
                                                        ocs[i].bv_val );
                                                *text = textbuf;
                                                return LDAP_OBJECT_CLASS_VIOLATION;