X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschemaparse.c;h=1ae61e0b65922068918466f2d5a47227703e8b65;hb=2c94c7915a52f8df4323c8193ec424df568f0fc1;hp=202329978f0562f97dd957ac2bf56f6b541c8940;hpb=9c3ed0310bc6de304f58f74daf967e6d405a19a5;p=openldap diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c index 202329978f..1ae61e0b65 100644 --- a/servers/slapd/schemaparse.c +++ b/servers/slapd/schemaparse.c @@ -1,6 +1,7 @@ /* schemaparse.c - routines to parse config file objectclass definitions */ +/* $OpenLDAP$ */ /* - * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -8,242 +9,211 @@ #include +#include #include #include #include "slap.h" #include "ldap_schema.h" -static Avlnode *object_classes = NULL; +int global_schemacheck = 1; /* schemacheck ON is default */ -int global_schemacheck = 1; /* schemacheck on is default */ +static void oc_usage(void); +static void at_usage(void); -static void oc_usage_old(void); -static void oc_usage(void); - -static char *err2text[] = { - "", +static char *const err2text[SLAP_SCHERR_LAST+1] = { + "Success", "Out of memory", - "Objectclass not found", - "Attribute type not found", - "Duplicate objectclass", - "Duplicate attributetype", - "Duplicate syntax", - "Duplicate matchingrule", + "ObjectClass not found", + "ObjectClass inappropriate SUPerior", + "AttributeType not found", + "AttributeType inappropriate USAGE", + "Duplicate objectClass", + "Duplicate attributeType", + "Duplicate ldapSyntax", + "Duplicate matchingRule", "OID or name required", - "Syntax or superior required", - "Matchingrule not found", + "SYNTAX or SUPerior required", + "MatchingRule not found", "Syntax not found", - "Syntax required" + "Syntax required", + "Qualifier not supported", + "Invalid NAME", + "OID could not be expanded" }; char * scherr2str(int code) { - if ( code < 1 || code >= (sizeof(err2text)/sizeof(char *)) ) { + if ( code < 0 || code >= (sizeof(err2text)/sizeof(char *)) ) { return "Unknown error"; } else { return err2text[code]; } } -void -parse_oc_old( - Backend *be, - char *fname, - int lineno, - int argc, - char **argv -) +/* check schema descr validity */ +int slap_valid_descr( const char *descr ) { - int i; - char last; - LDAP_OBJECT_CLASS *oc; - int code; - const char *err; - char **namep; - - oc = (LDAP_OBJECT_CLASS *) ch_calloc( 1, sizeof(LDAP_OBJECT_CLASS) ); - oc->oc_names = ch_calloc( 2, sizeof(char *) ); - oc->oc_names[0] = ch_strdup( argv[1] ); - oc->oc_names[1] = NULL; - if ( strcasecmp( oc->oc_names[0], "top" ) ) { - oc->oc_kind = LDAP_SCHEMA_STRUCTURAL; - } - for ( i = 2; i < argc; i++ ) { - /* required attributes */ - if ( strcasecmp( argv[i], "requires" ) == 0 ) { - do { - i++; - if ( i < argc ) { - char **s = str2charray( argv[i], "," ); - last = argv[i][strlen( argv[i] ) - 1]; - charray_merge( &oc->oc_at_oids_must, s ); - charray_free( s ); - } - } while ( i < argc && last == ',' ); - - /* optional attributes */ - } else if ( strcasecmp( argv[i], "allows" ) == 0 ) { - do { - i++; - if ( i < argc ) { - char **s = str2charray( argv[i], "," ); - last = argv[i][strlen( argv[i] ) - 1]; - - charray_merge( &oc->oc_at_oids_may, s ); - charray_free( s ); - } - } while ( i < argc && last == ',' ); - - } else { - fprintf( stderr, - "%s: line %d: expecting \"requires\" or \"allows\" got \"%s\"\n", - fname, lineno, argv[i] ); - oc_usage_old(); - } - } + int i=0; - /* - * There was no requirement in the old schema that all attributes - * types were defined before use and they would just default to - * SYNTAX_CIS. To support this, we need to make attribute types - * out of thin air. - */ - if ( oc->oc_at_oids_must ) { - namep = oc->oc_at_oids_must; - while ( *namep ) { - code = at_fake_if_needed( *namep ); - if ( code ) { - fprintf( stderr, "%s: line %d: %s %s\n", - fname, lineno, scherr2str(code), *namep); - exit( EXIT_FAILURE ); - } - namep++; - } + if( !DESC_LEADCHAR( descr[i] ) ) { + return 0; } - if ( oc->oc_at_oids_may ) { - namep = oc->oc_at_oids_may; - while ( *namep ) { - code = at_fake_if_needed( *namep ); - if ( code ) { - fprintf( stderr, "%s: line %d: %s %s\n", - fname, lineno, scherr2str(code), *namep); - exit( EXIT_FAILURE ); - } - namep++; + + while( descr[++i] ) { + if( !DESC_CHAR( descr[i] ) ) { + return 0; } } - - code = oc_add(oc,&err); - if ( code ) { - fprintf( stderr, "%s: line %d: %s %s\n", - fname, lineno, scherr2str(code), err); - exit( EXIT_FAILURE ); - } - ldap_memfree(oc); + + return 1; +} + + +/* OID Macros */ + +/* String compare with delimiter check. Return 0 if not + * matched, otherwise return length matched. + */ +int +dscompare(const char *s1, const char *s2, char delim) +{ + const char *orig = s1; + while (*s1++ == *s2++) + if (!s1[-1]) break; + --s1; + --s2; + if (!*s1 && (!*s2 || *s2 == delim)) + return s1 - orig; + return 0; } -void + +int parse_oc( - char *fname, + const char *fname, int lineno, - char *line + char *line, + char **argv ) { - LDAP_OBJECT_CLASS *oc; + LDAPObjectClass *oc; int code; const char *err; - oc = ldap_str2objectclass(line,&code,&err); + 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 ); oc_usage(); + return 1; } + + if ( oc->oc_oid == NULL ) { + fprintf( stderr, + "%s: line %d: objectclass has no OID\n", + fname, lineno ); + oc_usage(); + return 1; + } + code = oc_add(oc,&err); if ( code ) { - fprintf( stderr, "%s: line %d: %s %s\n", + fprintf( stderr, "%s: line %d: %s: \"%s\"\n", fname, lineno, scherr2str(code), err); - exit( EXIT_FAILURE ); + return 1; } + ldap_memfree(oc); + return 0; } static void oc_usage( void ) { - fprintf( stderr, "ObjectClassDescription = \"(\" whsp\n"); - fprintf( stderr, " numericoid whsp ; ObjectClass identifier\n"); - fprintf( stderr, " [ \"NAME\" qdescrs ]\n"); - fprintf( stderr, " [ \"DESC\" qdstring ]\n"); - fprintf( stderr, " [ \"OBSOLETE\" whsp ]\n"); - fprintf( stderr, " [ \"SUP\" oids ] ; Superior ObjectClasses\n"); - fprintf( stderr, " [ ( \"ABSTRACT\" / \"STRUCTURAL\" / \"AUXILIARY\" ) whsp ]\n"); - fprintf( stderr, " ; default structural\n"); - fprintf( stderr, " [ \"MUST\" oids ] ; AttributeTypes\n"); - fprintf( stderr, " [ \"MAY\" oids ] ; AttributeTypes\n"); - fprintf( stderr, "whsp \")\"\n"); - exit( EXIT_FAILURE ); + fprintf( stderr, + "ObjectClassDescription = \"(\" whsp\n" + " numericoid whsp ; ObjectClass identifier\n" + " [ \"NAME\" qdescrs ]\n" + " [ \"DESC\" qdstring ]\n" + " [ \"OBSOLETE\" whsp ]\n" + " [ \"SUP\" oids ] ; Superior ObjectClasses\n" + " [ ( \"ABSTRACT\" / \"STRUCTURAL\" / \"AUXILIARY\" ) whsp ]\n" + " ; default structural\n" + " [ \"MUST\" oids ] ; AttributeTypes\n" + " [ \"MAY\" oids ] ; AttributeTypes\n" + " whsp \")\"\n" ); } -static void -oc_usage_old( void ) -{ - fprintf( stderr, " ::= objectclass \n" ); - fprintf( stderr, " [ requires ]\n" ); - fprintf( stderr, " [ allows ]\n" ); - exit( EXIT_FAILURE ); -} static void at_usage( void ) { - fprintf( stderr, "AttributeTypeDescription = \"(\" whsp\n"); - fprintf( stderr, " numericoid whsp ; AttributeType identifier\n"); - fprintf( stderr, " [ \"NAME\" qdescrs ] ; name used in AttributeType\n"); - fprintf( stderr, " [ \"DESC\" qdstring ] ; description\n"); - fprintf( stderr, " [ \"OBSOLETE\" whsp ]\n"); - fprintf( stderr, " [ \"SUP\" woid ] ; derived from this other\n"); - fprintf( stderr, " ; AttributeType\n"); - fprintf( stderr, " [ \"EQUALITY\" woid ] ; Matching Rule name\n"); - fprintf( stderr, " [ \"ORDERING\" woid ] ; Matching Rule name\n"); - fprintf( stderr, " [ \"SUBSTR\" woid ] ; Matching Rule name\n"); - fprintf( stderr, " [ \"SYNTAX\" whsp noidlen whsp ] ; see section 4.3\n"); - fprintf( stderr, " [ \"SINGLE-VALUE\" whsp ] ; default multi-valued\n"); - fprintf( stderr, " [ \"COLLECTIVE\" whsp ] ; default not collective\n"); - fprintf( stderr, " [ \"NO-USER-MODIFICATION\" whsp ]; default user modifiable\n"); - fprintf( stderr, " [ \"USAGE\" whsp AttributeUsage ]; default userApplications\n"); - fprintf( stderr, " ; userApplications\n"); - fprintf( stderr, " ; directoryOperation\n"); - fprintf( stderr, " ; distributedOperation\n"); - fprintf( stderr, " ; dSAOperation\n"); - fprintf( stderr, "whsp \")\"\n"); - exit( EXIT_FAILURE ); + fprintf( stderr, + "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" + " [ \"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" + " [ \"NO-USER-MODIFICATION\" whsp ]; default user modifiable\n" + " [ \"USAGE\" whsp AttributeUsage ]; default userApplications\n" + " ; userApplications\n" + " ; directoryOperation\n" + " ; distributedOperation\n" + " ; dSAOperation\n" + " whsp \")\"\n"); } -void +int parse_at( - char *fname, + const char *fname, int lineno, - char *line + char *line, + char **argv ) { - LDAP_ATTRIBUTE_TYPE *at; + LDAPAttributeType *at; int code; const char *err; - at = ldap_str2attributetype(line,&code,&err); + 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 ); at_usage(); + return 1; + } + + if ( at->at_oid == NULL ) { + fprintf( stderr, + "%s: line %d: attributeType has no OID\n", + fname, lineno ); + at_usage(); + return 1; } + + /* 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 = at_add(at,&err); if ( code ) { - fprintf( stderr, "%s: line %d: %s %s\n", + fprintf( stderr, "%s: line %d: %s: \"%s\"\n", fname, lineno, scherr2str(code), err); - exit( EXIT_FAILURE ); + return 1; } ldap_memfree(at); + return 0; }