Fix wrong error when using operative attribute in

objectclass definition (ITS#3205)

diff --git a/servers/slapd/oc.c b/servers/slapd/oc.c
index 78ebaa7c6083cd2dc0f1ee17044e8fd446542813..42fd967ec3701c95ae85de91ebd7e460a6d30f00 100644 (file)
--- a/servers/slapd/oc.c
+++ b/servers/slapd/oc.c
@@ -469,6 +469,7 @@ oc_add(
        }
 
        if ( code != 0 ) return code;
+       if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
 
        code = oc_create_required( soc, soc->soc_at_oids_must, &op, err );
        if ( code != 0 ) return code;
@@ -476,7 +477,7 @@ oc_add(
        code = oc_create_allowed( soc, soc->soc_at_oids_may, &op, err );
        if ( code != 0 ) return code;
 
-       if( user && op ) return SLAP_SCHERR_CLASS_BAD_SUP;
+       if( user && op ) return SLAP_SCHERR_CLASS_BAD_USAGE;
 
        code = oc_insert(soc,err);
        return code;

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index d38fbfa1bb0745e5b997bf0c4a9682217e3c9379..630d7c3289ff541de33d4082f1e919a83c392417 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -126,8 +126,7 @@ parse_cr(
     const char *fname,
     int                lineno,
     char       *line,
-    char       **argv
-)
+    char       **argv )
 {
        LDAPContentRule *cr;
        int             code;
@@ -165,8 +164,7 @@ parse_oc(
     const char *fname,
     int                lineno,
     char       *line,
-    char       **argv
-)
+    char       **argv )
 {
        LDAPObjectClass *oc;
        int             code;
@@ -247,8 +245,7 @@ parse_at(
     const char *fname,
     int                lineno,
     char       *line,
-    char       **argv
-)
+    char       **argv )
 {
        LDAPAttributeType *at;
        int             code;