ITS#2888 don't return LDAP_SIZELIMIT_EXCEEDED prematurely

[openldap] / servers / slapd / schemaparse.c

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index c3e8f0b6a69d80af83a6fd352fcecc6b5ebdbe86..7f2611f1ee1a764be16b5e810d87083378ae914f 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -1,8 +1,17 @@
 /* schemaparse.c - routines to parse config file objectclass definitions */
 /* $OpenLDAP$ */
 /* schemaparse.c - routines to parse config file objectclass definitions */
 /* $OpenLDAP$ */

-/*
- * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2003 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.

  */
 
 #include "portable.h"
  */
 
 #include "portable.h"


@@ -25,29 +34,34 @@ static char *const err2text[] = {
        "Success",
        "Out of memory",
        "ObjectClass not found",
        "Success",
        "Out of memory",
        "ObjectClass not found",

-       "ObjectClass inappropriate SUPerior",
-       "ObjectClass operational",
+       "user-defined ObjectClass includes operational attributes",
+       "user-defined ObjectClass has inappropriate SUPerior",

        "Duplicate objectClass",
        "AttributeType not found",
        "Duplicate objectClass",
        "AttributeType not found",

+       "AttributeType inappropriate matching rule",

        "AttributeType inappropriate USAGE",
        "AttributeType inappropriate SUPerior",
        "AttributeType SYNTAX or SUPerior required",
        "Duplicate attributeType",
        "MatchingRule not found",
        "AttributeType inappropriate USAGE",
        "AttributeType inappropriate SUPerior",
        "AttributeType SYNTAX or SUPerior required",
        "Duplicate attributeType",
        "MatchingRule not found",

+       "MatchingRule incomplete",

        "Duplicate matchingRule",
        "Syntax not found",
        "Duplicate matchingRule",
        "Syntax not found",

-       "Syntax required",

        "Duplicate ldapSyntax",
        "OID or name required",
        "Qualifier not supported",
        "Invalid NAME",
        "Duplicate ldapSyntax",
        "OID or name required",
        "Qualifier not supported",
        "Invalid NAME",

-       "OID could not be expanded"
+       "OID could not be expanded",
+       "Duplicate Content Rule",
+       "Content Rule not for STRUCTURAL object class",
+       "Content Rule AUX contains inappropriate object class",
+       "Content Rule attribute type list contains duplicate"

 };
 
 char *
 scherr2str(int code)
 {
 };
 
 char *
 scherr2str(int code)
 {

-       if ( code < 0 || SLAP_SCHERR_LAST < code ) {
+       if ( code < 0 || SLAP_SCHERR_LAST <= code ) {

                return "Unknown error";
        } else {
                return err2text[code];
                return "Unknown error";
        } else {
                return err2text[code];


@@ -91,6 +105,60 @@ dscompare(const char *s1, const char *s2, char delim)
        return 0;
 }
 
        return 0;
 }
 

+static void
+cr_usage( void )
+{
+       fprintf( stderr,
+               "DITContentRuleDescription = \"(\" whsp\n"
+               "  numericoid whsp       ; StructuralObjectClass identifier\n"
+               "  [ \"NAME\" qdescrs ]\n"
+               "  [ \"DESC\" qdstring ]\n"
+               "  [ \"OBSOLETE\" whsp ]\n"
+               "  [ \"AUX\" oids ]      ; Auxiliary ObjectClasses\n"
+               "  [ \"MUST\" oids ]     ; AttributeTypes\n"
+               "  [ \"MAY\" oids ]      ; AttributeTypes\n"
+               "  [ \"NOT\" oids ]      ; AttributeTypes\n"
+               "  whsp \")\"\n" );
+}
+
+int
+parse_cr(
+    const char *fname,
+    int                lineno,
+    char       *line,
+    char       **argv
+)
+{
+       LDAPContentRule *cr;
+       int             code;
+       const char      *err;
+
+       cr = ldap_str2contentrule(line, &code, &err, LDAP_SCHEMA_ALLOW_ALL );
+       if ( !cr ) {
+               fprintf( stderr, "%s: line %d: %s before %s\n",
+                        fname, lineno, ldap_scherr2str(code), err );
+               cr_usage();
+               return 1;
+       }
+
+       if ( cr->cr_oid == NULL ) {
+               fprintf( stderr,
+                       "%s: line %d: Content rule has no OID\n",
+                       fname, lineno );
+               cr_usage();
+               return 1;
+       }
+
+       code = cr_add(cr,1,&err);
+       if ( code ) {
+               fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
+                        fname, lineno, scherr2str(code), err);
+               return 1;
+       }
+
+       ldap_memfree(cr);
+       return 0;
+}

 
 int
 parse_oc(
 
 int
 parse_oc(


@@ -148,24 +216,23 @@ oc_usage( void )
                "  whsp \")\"\n" );
 }
 
                "  whsp \")\"\n" );
 }
 

-

 static void
 at_usage( void )
 {
 static void
 at_usage( void )
 {

-       fprintf( stderr,
+       fprintf( stderr, "%s%s%s",

                "AttributeTypeDescription = \"(\" whsp\n"
                "  numericoid whsp      ; AttributeType identifier\n"
                "  [ \"NAME\" qdescrs ]             ; name used in AttributeType\n"
                "  [ \"DESC\" qdstring ]            ; description\n"
                "  [ \"OBSOLETE\" whsp ]\n"
                "  [ \"SUP\" woid ]                 ; derived from this other\n"
                "AttributeTypeDescription = \"(\" whsp\n"
                "  numericoid whsp      ; AttributeType identifier\n"
                "  [ \"NAME\" qdescrs ]             ; name used in AttributeType\n"
                "  [ \"DESC\" qdstring ]            ; description\n"
                "  [ \"OBSOLETE\" whsp ]\n"
                "  [ \"SUP\" woid ]                 ; derived from this other\n"

-               "                                   ; AttributeType\n"
+               "                                   ; AttributeType\n",

                "  [ \"EQUALITY\" woid ]            ; Matching Rule name\n"
                "  [ \"ORDERING\" woid ]            ; Matching Rule name\n"
                "  [ \"SUBSTR\" woid ]              ; Matching Rule name\n"
                "  [ \"SYNTAX\" whsp noidlen whsp ] ; see section 4.3\n"
                "  [ \"SINGLE-VALUE\" whsp ]        ; default multi-valued\n"
                "  [ \"EQUALITY\" woid ]            ; Matching Rule name\n"
                "  [ \"ORDERING\" woid ]            ; Matching Rule name\n"
                "  [ \"SUBSTR\" woid ]              ; Matching Rule name\n"
                "  [ \"SYNTAX\" whsp noidlen whsp ] ; see section 4.3\n"
                "  [ \"SINGLE-VALUE\" whsp ]        ; default multi-valued\n"

-               "  [ \"COLLECTIVE\" whsp ]          ; default not collective\n"
+               "  [ \"COLLECTIVE\" whsp ]          ; default not collective\n",

                "  [ \"NO-USER-MODIFICATION\" whsp ]; default user modifiable\n"
                "  [ \"USAGE\" whsp AttributeUsage ]; default userApplications\n"
                "                                   ; userApplications\n"
                "  [ \"NO-USER-MODIFICATION\" whsp ]; default user modifiable\n"
                "  [ \"USAGE\" whsp AttributeUsage ]; default userApplications\n"
                "                                   ; userApplications\n"