Add link to FAQ entry on BDB tuning

[openldap] / servers / slapd / schemaparse.c

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 6205f382fba2aa653325b7a9e5600601449b7fd9..f802f1ad59a541ee2cc774fb9746ca62aa435911 100644 (file)
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *

- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.

  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without


@@ -35,12 +35,14 @@ static char *const err2text[] = {
        "user-defined ObjectClass includes operational attributes",
        "user-defined ObjectClass has inappropriate SUPerior",
        "Duplicate objectClass",
        "user-defined ObjectClass includes operational attributes",
        "user-defined ObjectClass has inappropriate SUPerior",
        "Duplicate objectClass",

+       "Inconsistent duplicate objectClass",

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

+       "Inconsistent duplicate attributeType",

        "MatchingRule not found",
        "MatchingRule incomplete",
        "Duplicate matchingRule",
        "MatchingRule not found",
        "MatchingRule incomplete",
        "Duplicate matchingRule",


@@ -53,7 +55,8 @@ static char *const err2text[] = {
        "Duplicate Content Rule",
        "Content Rule not for STRUCTURAL object class",
        "Content Rule AUX contains inappropriate object class",
        "Duplicate Content Rule",
        "Content Rule not for STRUCTURAL object class",
        "Content Rule AUX contains inappropriate object class",

-       "Content Rule attribute type list contains duplicate"
+       "Content Rule attribute type list contains duplicate",
+       NULL

 };
 
 char *
 };
 
 char *


@@ -121,16 +124,17 @@ cr_usage( void )
 
 int
 parse_cr(
 
 int
 parse_cr(

-    const char *fname,
-    int                lineno,
-    char       *line,
-    char       **argv )
+       const char      *fname,
+       int             lineno,
+       char            *line,
+       char            **argv,
+       ContentRule     **scr )

 {
        LDAPContentRule *cr;
        int             code;
        const char      *err;
 
 {
        LDAPContentRule *cr;
        int             code;
        const char      *err;
 

-       cr = ldap_str2contentrule(line, &code, &err, LDAP_SCHEMA_ALLOW_ALL );
+       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 );
        if ( !cr ) {
                fprintf( stderr, "%s: line %d: %s before %s\n",
                         fname, lineno, ldap_scherr2str(code), err );


@@ -143,26 +147,36 @@ parse_cr(
                        "%s: line %d: Content rule has no OID\n",
                        fname, lineno );
                cr_usage();
                        "%s: line %d: Content rule has no OID\n",
                        fname, lineno );
                cr_usage();

-               return 1;
+               code = 1;
+               goto done;

        }
 
        }
 

-       code = cr_add(cr,1,&err);
+       code = cr_add( cr, 1, scr, &err );

        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",

-                        fname, lineno, scherr2str(code), err);
-               return 1;
+                        fname, lineno, scherr2str( code ), err );
+               code = 1;
+               goto done;

        }
 
        }
 

-       ldap_memfree(cr);
-       return 0;
+done:;
+       if ( code ) {
+               ldap_contentrule_free( cr );
+
+       } else {
+               ldap_memfree( cr );
+       }
+
+       return code;

 }
 
 int
 parse_oc(
 }
 
 int
 parse_oc(

-    const char *fname,
-    int                lineno,
-    char       *line,
-    char       **argv )
+       const char      *fname,
+       int             lineno,
+       char            *line,
+       char            **argv,
+       ObjectClass     **soc )

 {
        LDAPObjectClass *oc;
        int             code;
 {
        LDAPObjectClass *oc;
        int             code;


@@ -171,7 +185,7 @@ parse_oc(
        oc = ldap_str2objectclass(line, &code, &err, LDAP_SCHEMA_ALLOW_ALL );
        if ( !oc ) {
                fprintf( stderr, "%s: line %d: %s before %s\n",
        oc = ldap_str2objectclass(line, &code, &err, LDAP_SCHEMA_ALLOW_ALL );
        if ( !oc ) {
                fprintf( stderr, "%s: line %d: %s before %s\n",

-                        fname, lineno, ldap_scherr2str(code), err );
+                        fname, lineno, ldap_scherr2str( code ), err );

                oc_usage();
                return 1;
        }
                oc_usage();
                return 1;
        }


@@ -181,18 +195,27 @@ parse_oc(
                        "%s: line %d: objectclass has no OID\n",
                        fname, lineno );
                oc_usage();
                        "%s: line %d: objectclass has no OID\n",
                        fname, lineno );
                oc_usage();

-               return 1;
+               code = 1;
+               goto done;

        }
 
        }
 

-       code = oc_add(oc,1,&err);
+       code = oc_add( oc, 1, soc, &err );

        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",

-                        fname, lineno, scherr2str(code), err);
-               return 1;
+                        fname, lineno, scherr2str( code ), err );
+               code = 1;
+               goto done;

        }
 
        }
 

-       ldap_memfree(oc);
-       return 0;
+done:;
+       if ( code ) {
+               ldap_objectclass_free( oc );
+
+       } else {
+               ldap_memfree( oc );
+       }
+
+       return code;

 }
 
 static void
 }
 
 static void


@@ -240,10 +263,11 @@ at_usage( void )
 
 int
 parse_at(
 
 int
 parse_at(

-    const char *fname,
-    int                lineno,
-    char       *line,
-    char       **argv )
+       const char      *fname,
+       int             lineno,
+       char            *line,
+       char            **argv,
+       AttributeType   **sat )

 {
        LDAPAttributeType *at;
        int             code;
 {
        LDAPAttributeType *at;
        int             code;


@@ -262,22 +286,33 @@ parse_at(
                        "%s: line %d: attributeType has no OID\n",
                        fname, lineno );
                at_usage();
                        "%s: line %d: attributeType has no OID\n",
                        fname, lineno );
                at_usage();

-               return 1;
+               code = 1;
+               goto done;

        }
 
        /* operational attributes should be defined internally */
        if ( at->at_usage ) {
                fprintf( stderr, "%s: line %d: attribute type \"%s\" is operational\n",
                         fname, lineno, at->at_oid );
        }
 
        /* operational attributes should be defined internally */
        if ( at->at_usage ) {
                fprintf( stderr, "%s: line %d: attribute type \"%s\" is operational\n",
                         fname, lineno, at->at_oid );

-               return 1;
+               code = 1;
+               goto done;

        }
 
        }
 

-       code = at_add(at,&err);
+       code = at_add( at, 1, sat, &err);

        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
                         fname, lineno, scherr2str(code), err);
        if ( code ) {
                fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
                         fname, lineno, scherr2str(code), err);

-               return 1;
+               code = 1;
+               goto done;

        }
        }

-       ldap_memfree(at);
-       return 0;
+
+done:;
+       if ( code ) {
+               ldap_attributetype_free( at );
+
+       } else {
+               ldap_memfree( at );
+       }
+
+       return code;

 }
 }