import fix to ITS#5474

diff --git a/CHANGES b/CHANGES
index 94df2650bdb2205ec6780e6cdef2fc7bf022b3e7..85d3b7c3b11b28cc8ff8f5757959cb9e120b60d4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -5,6 +5,7 @@ OpenLDAP 2.4.9 Engineering
        Fixed libldap error message for missing close paren (ITS#5458)
        Fixed libldap_r tpool pause checks (ITS#5364, #5407)
        Fixed slapcat error checking (ITS#5387)
+       Fixed slapd abstract objectClass inheritance check (ITS#5474)
        Fixed slapd add operations requiring naming attrs (ITS#5412)
        Fixed slapd frontendDB backend selection (ITS#5419)
        Fixed slapd delta-syncrepl resync (ITS#5378)

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index b370876da6253d0e8aaf0b52e32f7a759ebdb860..ca0f7309809a65898ff5afdef63719f80dffe033 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -356,8 +356,8 @@ got_soc:
                                        }
                                }
 
-                               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 );