From: Pierangelo Masarati <ando@openldap.org>
Date: Sat, 19 Apr 2008 00:33:42 +0000 (+0000)
Subject: import fix to ITS#5474
X-Git-Tag: OPENLDAP_REL_ENG_2_3_42~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84864d4c9fb1bd49a0366766cf0fcf79a5fc74d7;p=thirdparty%2Fopenldap.git

import fix to ITS#5474
---

diff --git a/CHANGES b/CHANGES
index 2d699c781f..b94953eb67 100644
--- 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 289ec876a9..2c46ede155 100644
--- 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 );