X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschemaparse.c;h=f802f1ad59a541ee2cc774fb9746ca62aa435911;hb=f96e6378d6cd06c744a47af5e5e551cbb494826a;hp=cb5fca8f82d05f7f792ed66f1593ad4f05594dfc;hpb=8a5b200c447a758d91805827593db72c54bea6e2;p=openldap
diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index cb5fca8f82..f802f1ad59 100644
--- a/servers/slapd/schemaparse.c
+++ b/servers/slapd/schemaparse.c
@@ -1,8 +1,17 @@
/* 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 .
+ *
+ * Copyright 1998-2006 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
+ * .
*/
#include "portable.h"
@@ -16,8 +25,6 @@
#include "slap.h"
#include "ldap_schema.h"
-int global_schemacheck = 1; /* schemacheck ON is default */
-
static void oc_usage(void);
static void at_usage(void);
@@ -28,12 +35,14 @@ static char *const err2text[] = {
"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",
+ "Inconsistent duplicate attributeType",
"MatchingRule not found",
"MatchingRule incomplete",
"Duplicate matchingRule",
@@ -42,7 +51,12 @@ static char *const err2text[] = {
"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",
+ NULL
};
char *
@@ -92,14 +106,77 @@ dscompare(const char *s1, const char *s2, char delim)
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,
+ ContentRule **scr )
+{
+ 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();
+ code = 1;
+ goto done;
+ }
+
+ code = cr_add( cr, 1, scr, &err );
+ if ( code ) {
+ fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
+ fname, lineno, scherr2str( code ), err );
+ code = 1;
+ goto done;
+ }
+
+done:;
+ if ( code ) {
+ ldap_contentrule_free( cr );
+
+ } else {
+ ldap_memfree( cr );
+ }
+
+ return code;
+}
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;
@@ -108,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",
- fname, lineno, ldap_scherr2str(code), err );
+ fname, lineno, ldap_scherr2str( code ), err );
oc_usage();
return 1;
}
@@ -118,18 +195,27 @@ parse_oc(
"%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",
- 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
@@ -149,24 +235,23 @@ oc_usage( void )
" whsp \")\"\n" );
}
-
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"
- " ; 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"
- " [ \"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"
@@ -178,11 +263,11 @@ at_usage( void )
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;
@@ -201,22 +286,33 @@ parse_at(
"%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 );
- 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);
- return 1;
+ code = 1;
+ goto done;
}
- ldap_memfree(at);
- return 0;
+
+done:;
+ if ( code ) {
+ ldap_attributetype_free( at );
+
+ } else {
+ ldap_memfree( at );
+ }
+
+ return code;
}