X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschemaparse.c;h=d38fbfa1bb0745e5b997bf0c4a9682217e3c9379;hb=873be21a22ee220e096691f7593ba5bdd5d8ab8e;hp=4e596d44e0056221ec9c44cd446295c6e9780e86;hpb=c80d93f2bb0d24da2919fa0994f7d1c4f6459897;p=openldap
diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 4e596d44e0..d38fbfa1bb 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-2004 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"
@@ -25,26 +34,34 @@ static char *const err2text[] = {
"Success",
"Out of memory",
"ObjectClass not found",
- "ObjectClass inappropriate SUPerior",
+ "user-defined ObjectClass includes operational attributes",
+ "user-defined ObjectClass has inappropriate SUPerior",
+ "Duplicate objectClass",
"AttributeType not found",
+ "AttributeType inappropriate matching rule",
"AttributeType inappropriate USAGE",
- "Duplicate objectClass",
+ "AttributeType inappropriate SUPerior",
+ "AttributeType SYNTAX or SUPerior required",
"Duplicate attributeType",
- "Duplicate ldapSyntax",
- "Duplicate matchingRule",
- "OID or name required",
- "SYNTAX or SUPerior required",
"MatchingRule not found",
+ "MatchingRule incomplete",
+ "Duplicate matchingRule",
"Syntax not found",
- "Syntax required",
+ "Duplicate ldapSyntax",
+ "OID or name required",
"Qualifier not supported",
- "Invalid NAME"
+ "Invalid NAME",
+ "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)
{
- if ( code < 0 || code >= (sizeof(err2text)/sizeof(char *)) ) {
+ if ( code < 0 || SLAP_SCHERR_LAST <= code ) {
return "Unknown error";
} else {
return err2text[code];
@@ -88,109 +105,58 @@ dscompare(const char *s1, const char *s2, char delim)
return 0;
}
-static OidMacro *om_list = NULL;
-
-/* Replace an OID Macro invocation with its full numeric OID.
- * If the macro is used with "macroname:suffix" append ".suffix"
- * to the expansion.
- */
-static char *
-find_oidm(char *oid)
-{
- OidMacro *om;
-
- /* OID macros must start alpha */
- if ( OID_LEADCHAR( *oid ) ) {
- return oid;
- }
-
- for (om = om_list; om; om=om->som_next) {
- char **names = om->som_names;
-
- if( names == NULL ) {
- continue;
- }
-
- for( ; *names != NULL ; names++ ) {
- int pos = dscompare(*names, oid, ':');
-
- if( pos ) {
- int suflen = strlen(oid + pos);
- char *tmp = ch_malloc( om->som_oid.bv_len
- + suflen + 1);
- strcpy(tmp, om->som_oid.bv_val);
- if( suflen ) {
- suflen = om->som_oid.bv_len;
- tmp[suflen++] = '.';
- strcpy(tmp+suflen, oid+pos+1);
- }
- return tmp;
- }
- }
- }
- return NULL;
-}
-
-void
-oidm_destroy()
+static void
+cr_usage( void )
{
- OidMacro *om, *n;
-
- for (om = om_list; om; om = n) {
- n = om->som_next;
- charray_free(om->som_names);
- free(om->som_oid.bv_val);
- free(om);
- }
+ 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_oidm(
+parse_cr(
const char *fname,
int lineno,
- int argc,
- char **argv
+ char *line,
+ char **argv
)
{
- char *oid;
- OidMacro *om;
+ LDAPContentRule *cr;
+ int code;
+ const char *err;
- if (argc != 3) {
- fprintf( stderr, "%s: line %d: too many arguments\n",
- fname, lineno );
-usage: fprintf( stderr, "\tObjectIdentifier \n");
+ 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;
}
- oid = find_oidm( argv[1] );
- if( oid != NULL ) {
+ if ( cr->cr_oid == NULL ) {
fprintf( stderr,
- "%s: line %d: "
- "ObjectIdentifier \"%s\" previously defined \"%s\"",
- fname, lineno, argv[1], oid );
+ "%s: line %d: Content rule has no OID\n",
+ fname, lineno );
+ cr_usage();
return 1;
}
- om = (OidMacro *) ch_malloc( sizeof(OidMacro) );
-
- om->som_names = NULL;
- charray_add( &om->som_names, argv[1] );
- om->som_oid.bv_val = find_oidm( argv[2] );
-
- if (!om->som_oid.bv_val) {
- fprintf( stderr, "%s: line %d: OID %s not recognized\n",
- fname, lineno, argv[2] );
- goto usage;
- }
-
- if (om->som_oid.bv_val == argv[2]) {
- om->som_oid.bv_val = ch_strdup( argv[2] );
+ code = cr_add(cr,1,&err);
+ if ( code ) {
+ fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
+ fname, lineno, scherr2str(code), err);
+ return 1;
}
- om->som_oid.bv_len = strlen( om->som_oid.bv_val );
- om->som_next = om_list;
- om_list = om;
-
+ ldap_memfree(cr);
return 0;
}
@@ -205,9 +171,8 @@ parse_oc(
LDAPObjectClass *oc;
int code;
const char *err;
- char *oid = NULL;
- oc = ldap_str2objectclass(line,&code,&err,LDAP_SCHEMA_ALLOW_ALL);
+ 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 );
@@ -223,22 +188,7 @@ parse_oc(
return 1;
}
- if ( !OID_LEADCHAR( oc->oc_oid[0] )) {
- /* Expand OID macros */
- oid = find_oidm( oc->oc_oid );
- if ( !oid ) {
- fprintf( stderr,
- "%s: line %d: OID %s not recognized\n",
- fname, lineno, oc->oc_oid);
- return 1;
- }
- if ( oid != oc->oc_oid ) {
- ldap_memfree( oc->oc_oid );
- oc->oc_oid = oid;
- }
- }
-
- code = oc_add(oc,&err);
+ code = oc_add(oc,1,&err);
if ( code ) {
fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
fname, lineno, scherr2str(code), err);
@@ -266,24 +216,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"
@@ -304,9 +253,8 @@ parse_at(
LDAPAttributeType *at;
int code;
const char *err;
- char *oid = NULL;
- at = ldap_str2attributetype(line,&code,&err,LDAP_SCHEMA_ALLOW_ALL);
+ at = ldap_str2attributetype( line, &code, &err, LDAP_SCHEMA_ALLOW_ALL );
if ( !at ) {
fprintf( stderr, "%s: line %d: %s before %s\n",
fname, lineno, ldap_scherr2str(code), err );
@@ -322,45 +270,12 @@ parse_at(
return 1;
}
-#if 0
/* 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;
}
-#endif
-
- if ( !OID_LEADCHAR( at->at_oid[0] )) {
- /* Expand OID macros */
- oid = find_oidm( at->at_oid );
- if ( !oid ) {
- fprintf( stderr,
- "%s: line %d: OID %s not recognized\n",
- fname, lineno, at->at_oid);
- return 1;
- }
- if ( oid != at->at_oid ) {
- ldap_memfree( at->at_oid );
- at->at_oid = oid;
- }
- }
-
- if ( at->at_syntax_oid && !OID_LEADCHAR( at->at_syntax_oid[0] )) {
- /* Expand OID macros */
- oid = find_oidm( at->at_syntax_oid );
- if ( !oid ) {
- fprintf(stderr,
- "%s: line %d: OID %s not recognized\n",
- fname, lineno, at->at_syntax_oid);
- return 1;
- }
- if ( oid != at->at_syntax_oid ) {
- ldap_memfree( at->at_syntax_oid );
- at->at_syntax_oid = oid;
- }
-
- }
code = at_add(at,&err);
if ( code ) {