/* schemaparse.c - routines to parse config file objectclass definitions */
+/* $OpenLDAP$ */
+/*
+ * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+ */
#include "portable.h"
#include <stdio.h>
+#include <ac/ctype.h>
#include <ac/string.h>
#include <ac/socket.h>
#include "slap.h"
#include "ldap_schema.h"
-ObjectClass *global_oc;
-static Avlnode *object_classes = NULL;
-
-AttributeType *global_at;
int global_schemacheck = 1; /* schemacheck on is default */
-static void oc_usage_old(void);
-static void oc_usage(void);
+static void oc_usage_old(void) LDAP_GCCATTR((noreturn));
+static void oc_usage(void) LDAP_GCCATTR((noreturn));
+static void at_usage(void) LDAP_GCCATTR((noreturn));
-static char *err2text[] = {
+static char *const err2text[] = {
"",
"Out of memory",
"Objectclass not found",
"Attribute type not found",
"Duplicate objectclass",
- "Duplicate attributetype"
+ "Duplicate attributetype",
+ "Duplicate syntax",
+ "Duplicate matchingrule",
+ "OID or name required",
+ "Syntax or superior required",
+ "Matchingrule not found",
+ "Syntax not found",
+ "Syntax required"
};
char *
void
parse_oc_old(
Backend *be,
- char *fname,
+ const char *fname,
int lineno,
int argc,
char **argv
)
{
+#ifdef SLAPD_SCHEMA_COMPAT
int i;
char last;
LDAP_OBJECT_CLASS *oc;
int code;
- char *err;
+ 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" ) ) {
+ /*
+ * no way to distinguish "auxiliary" from "structural"
+ * This may lead to future problems.
+ */
+ oc->oc_kind = LDAP_SCHEMA_STRUCTURAL;
+ }
for ( i = 2; i < argc; i++ ) {
/* required attributes */
if ( strcasecmp( argv[i], "requires" ) == 0 ) {
* out of thin air.
*/
if ( oc->oc_at_oids_must ) {
- namep = oc->oc_at_oids_must;
- while ( *namep ) {
+ for( namep = oc->oc_at_oids_must; *namep ; namep++ ) {
code = at_fake_if_needed( *namep );
if ( code ) {
fprintf( stderr, "%s: line %d: %s %s\n",
fname, lineno, scherr2str(code), *namep);
- exit( 1 );
+ exit( EXIT_FAILURE );
}
- namep++;
}
}
if ( oc->oc_at_oids_may ) {
- namep = oc->oc_at_oids_may;
- while ( *namep ) {
+ for( namep = oc->oc_at_oids_may; *namep; namep++ ) {
code = at_fake_if_needed( *namep );
if ( code ) {
fprintf( stderr, "%s: line %d: %s %s\n",
fname, lineno, scherr2str(code), *namep);
- exit( 1 );
+ exit( EXIT_FAILURE );
}
- namep++;
}
}
if ( code ) {
fprintf( stderr, "%s: line %d: %s %s\n",
fname, lineno, scherr2str(code), err);
- exit( 1 );
+ exit( EXIT_FAILURE );
}
ldap_memfree(oc);
+
+#else
+ fprintf( stderr, "%s: line %d: %s %s\n",
+ fname, lineno, "not built with -DSLAPD_SCHEMA_COMPAT\n");
+ exit( EXIT_FAILURE );
+#endif
+}
+
+/* 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;
+}
+
+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;
+ char *new;
+ int pos, suflen;
+
+ /* OID macros must start alpha */
+ if ( !isdigit( *oid ) )
+ {
+ for (om = om_list; om; om=om->som_next)
+ {
+ if ((pos = dscompare(om->som_name, oid, ':')))
+ {
+ suflen = strlen(oid + pos);
+ new = ch_calloc(1, om->som_oidlen + suflen + 1);
+ strcpy(new, om->som_oid);
+ if (suflen)
+ {
+ suflen = om->som_oidlen;
+ new[suflen++] = '.';
+ strcpy(new+suflen, oid+pos+1);
+ }
+ return new;
+ }
+ }
+ return NULL;
+ }
+ return oid;
+}
+
+void
+parse_oidm(
+ const char *fname,
+ int lineno,
+ int argc,
+ char **argv
+)
+{
+ OidMacro *om;
+
+ if (argc != 3) {
+usage: fprintf( stderr, "ObjectIdentifier <name> <oid>\n");
+ exit( EXIT_FAILURE );
+ }
+
+ om = (OidMacro *) ch_malloc( sizeof(OidMacro) );
+ om->som_name = ch_strdup( argv[1] );
+ om->som_oid = find_oidm( argv[2] );
+
+ if (!om->som_oid) {
+ fprintf( stderr, "%s: line %d: OID %s not recognized\n",
+ fname, lineno, argv[2] );
+ goto usage;
+ }
+
+ if (om->som_oid == argv[2]) {
+ om->som_oid = ch_strdup( argv[2] );
+ }
+
+ om->som_oidlen = strlen( om->som_oid );
+ om->som_next = om_list;
+ om_list = om;
}
void
parse_oc(
- char *fname,
+ const char *fname,
int lineno,
- char *line
+ char *line,
+ char **argv
)
{
LDAP_OBJECT_CLASS *oc;
int code;
- char *err;
+ const char *err;
+ char *oid = NULL;
oc = ldap_str2objectclass(line,&code,&err);
if ( !oc ) {
fname, lineno, ldap_scherr2str(code), err );
oc_usage();
}
+ if ( oc->oc_oid ) {
+ if ( !isdigit( 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);
+ exit( EXIT_FAILURE );
+ }
+ if ( oid != oc->oc_oid ) {
+ ldap_memfree( oc->oc_oid );
+ oc->oc_oid = oid;
+ }
+ }
+ }
+ /* oc->oc_oid == NULL will be an error someday */
code = oc_add(oc,&err);
if ( code ) {
fprintf( stderr, "%s: line %d: %s %s\n",
fname, lineno, scherr2str(code), err);
- exit( 1 );
+ exit( EXIT_FAILURE );
}
ldap_memfree(oc);
}
fprintf( stderr, " [ \"MUST\" oids ] ; AttributeTypes\n");
fprintf( stderr, " [ \"MAY\" oids ] ; AttributeTypes\n");
fprintf( stderr, "whsp \")\"\n");
- exit( 1 );
+ exit( EXIT_FAILURE );
}
static void
fprintf( stderr, "<oc clause> ::= objectclass <ocname>\n" );
fprintf( stderr, " [ requires <attrlist> ]\n" );
fprintf( stderr, " [ allows <attrlist> ]\n" );
- exit( 1 );
+ exit( EXIT_FAILURE );
}
static void
fprintf( stderr, " ; distributedOperation\n");
fprintf( stderr, " ; dSAOperation\n");
fprintf( stderr, "whsp \")\"\n");
- exit( 1 );
+ exit( EXIT_FAILURE );
}
void
parse_at(
- char *fname,
+ const char *fname,
int lineno,
- char *line
+ char *line,
+ char **argv
)
{
LDAP_ATTRIBUTE_TYPE *at;
int code;
- char *err;
+ const char *err;
+ char *oid = NULL;
+ char *soid = NULL;
+ /* Kludge for OIDmacros for syntaxes. If the syntax field starts
+ * nonnumeric, look for and expand a macro. The macro's place in
+ * the input line will be replaced with a field of '0's to keep
+ * ldap_str2attributetype happy. The actual oid will be swapped
+ * into place afterwards.
+ */
+ for (; argv[3]; argv++)
+ {
+ if (!strcasecmp(argv[3], "syntax") &&
+ !isdigit(*argv[4]))
+ {
+ int slen;
+ Syntax *syn;
+ syn = syn_find_desc(argv[4], &slen);
+ if (!syn)
+ {
+ fprintf(stderr, "%s: line %d: OID %s not found\n",
+ fname, lineno, argv[4]);
+ exit( EXIT_FAILURE );
+ }
+ memset(strstr(line, argv[4]), '0', slen);
+ soid = ch_strdup(syn->ssyn_syn.syn_oid );
+ break;
+ }
+ }
at = ldap_str2attributetype(line,&code,&err);
if ( !at ) {
fprintf( stderr, "%s: line %d: %s before %s\n",
fname, lineno, ldap_scherr2str(code), err );
at_usage();
}
+ if ( at->at_oid ) {
+ if ( !isdigit( 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);
+ exit( EXIT_FAILURE );
+ }
+ if ( oid != at->at_oid ) {
+ ldap_memfree( at->at_oid );
+ at->at_oid = oid;
+ }
+ }
+ }
+ /* at->at_oid == NULL will be an error someday */
+ if (soid)
+ {
+ ldap_memfree(at->at_syntax_oid);
+ at->at_syntax_oid = soid;
+ }
code = at_add(at,&err);
if ( code ) {
fprintf( stderr, "%s: line %d: %s %s\n",
fname, lineno, scherr2str(code), err);
- exit( 1 );
+ exit( EXIT_FAILURE );
}
ldap_memfree(at);
}
projects / openldap / blobdiff