Fix bug in last commit

diff --git a/servers/slapd/schema_check.c b/servers/slapd/schema_check.c
index 4a57356be71a850e1052e2d4ea895c8c308133d7..b53cd45353e4e35fcdc08211f17835a1537290f9 100644 (file)
--- a/servers/slapd/schema_check.c
+++ b/servers/slapd/schema_check.c
@@ -550,7 +550,7 @@ int structural_class(
 
        *scbv = ocs[scn];
 
-       if( scbv->bv_len ) {
+       if( scbv->bv_len == 0 ) {
                *text = "invalid structural object class";
                return LDAP_OBJECT_CLASS_VIOLATION;
        }

diff --git a/servers/slapd/tools/slapadd.c b/servers/slapd/tools/slapadd.c
index aeede043bb373a1c9fc49fb1ae3ca14d8a5247a0..e993da5fa8fb9f35aab4c156f8a537dd1887114d 100644 (file)
--- a/servers/slapd/tools/slapadd.c
+++ b/servers/slapd/tools/slapadd.c
@@ -119,13 +119,12 @@ main( int argc, char **argv )
                        if( sc == NULL ) {
                                struct berval vals[2];
 
-                               /* int ret = */ 
-                               structural_class( oc->a_vals, vals,
+                               rc = structural_class( oc->a_vals, vals,
                                        NULL, &text, textbuf, textlen );
 
-                               if( vals[0].bv_len == 0 ) {
-                                       fprintf( stderr, "%s: dn=\"%s\" (line=%d): %s\n",
-                                               progname, e->e_dn, lineno, text );
+                               if( rc != LDAP_SUCCESS ) {
+                                       fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
+                                               progname, e->e_dn, lineno, rc, text );
                                        rc = EXIT_FAILURE;
                                        entry_free( e );
                                        if( continuemode ) continue;
@@ -141,8 +140,8 @@ main( int argc, char **argv )
                        rc = entry_schema_check( be, e, NULL, &text, textbuf, textlen );
 
                        if( rc != LDAP_SUCCESS ) {
-                               fprintf( stderr, "%s: dn=\"%s\" (line=%d): %s\n",
-                                       progname, e->e_dn, lineno, text );
+                               fprintf( stderr, "%s: dn=\"%s\" (line=%d): (%d) %s\n",
+                                       progname, e->e_dn, lineno, rc, text );
                                rc = EXIT_FAILURE;
                                entry_free( e );
                                if( continuemode ) continue;