add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / schema_check.c

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index 37dd9e94605966d74cbe2e1edf723dd2a8475822..2ec71868dd197bb652ea650ff4eeddd8b4663376 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -810,12 +810,12 @@ int mods_structural_class(
                return LDAP_OBJECT_CLASS_VIOLATION;
        }
 
-       if( ocmod->sml_bvalues == NULL || ocmod->sml_bvalues[0].bv_val == NULL ) {
+       if( ocmod->sml_values == NULL || ocmod->sml_values[0].bv_val == NULL ) {
                *text = "objectClass attribute has no values";
                return LDAP_OBJECT_CLASS_VIOLATION;
        }
 
-       return structural_class( ocmod->sml_bvalues, sc, NULL,
+       return structural_class( ocmod->sml_values, sc, NULL,
                text, textbuf, textlen );
 }
 
@@ -881,7 +881,7 @@ entry_naming_check(
 
                if( desc->ad_type->sat_obsolete ) {
                        snprintf( textbuf, textlen, 
-                               "naming attribute '%s' is collective",
+                               "naming attribute '%s' is obsolete",
                                ava->la_attr.bv_val );
                        rc = LDAP_NAMING_VIOLATION;
                        break;