import fix to ITS#5474

diff --git a/CHANGES b/CHANGES
index 2d699c781f093f2c460b3c7504b07a7cdbc82c26..b94953eb678f0158da75ccbaf548312812dfe27d 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,7 @@
 OpenLDAP 2.3 Change Log
 
 OpenLDAP 2.3.42 Engineering
+       Fixed slapd abstract objectClass inheritance check (ITS#5474)
        Fixed slapd delta-syncrepl refresh mode (ITS#5376)
        Fixed slapd delta-syncrepl resync (ITS#5378)
        Fixed slapd pagedresults stale state (ITS#5409)

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index 289ec876a931dbfba78f0f49ec3f709190904f19..2c46ede1559f3984cc9e97bf6cc89e462010fcdf 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -328,11 +328,11 @@ entry_schema_check(
                                ObjectClass *xc = NULL;
                                for( j=0; aoc->a_vals[j].bv_val; j++ ) {
                                        if( i != j ) {
-                                               xc = oc_bvfind( &aoc->a_vals[i] );
+                                               xc = oc_bvfind( &aoc->a_vals[j] );
                                                if( xc == NULL ) {
                                                        snprintf( textbuf, textlen, 
                                                                "unrecognized objectClass '%s'",
-                                                               aoc->a_vals[i].bv_val );
+                                                               aoc->a_vals[j].bv_val );
 
                                                        Debug( LDAP_DEBUG_ANY,
                                                                "entry_check_schema(%s): %s\n",
@@ -356,8 +356,8 @@ entry_schema_check(
                                        }
                                }
 
-                               if( xc == NULL ) {
-                                       snprintf( textbuf, textlen, "instanstantiation of "
+                               if( xc != NULL ) {
+                                       snprintf( textbuf, textlen, "instantiation of "
                                                "abstract objectClass '%s' not allowed",
                                                aoc->a_vals[i].bv_val );