X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschemaparse.c;h=bf37c50c37af87de0c8aa4537dec5b8489b2992c;hb=01c38dd6ea7f02cfdc9f77f9299771a4ef6ce968;hp=a1c6f34f12cf2caee2f5e89334f0fca096568cfd;hpb=dc0eacd40b625258355eea866d62188e5aa7ce3b;p=openldap

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index a1c6f34f12..bf37c50c37 100644
--- 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/>.
  *
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -24,8 +24,7 @@
 
 #include "slap.h"
 #include "ldap_schema.h"
-
-int	global_schemacheck = 1; /* schemacheck ON is default */
+#include "config.h"
 
 static void		oc_usage(void); 
 static void		at_usage(void);
@@ -37,12 +36,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",
@@ -55,7 +56,8 @@ static char *const err2text[] = {
 	"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 *
@@ -123,78 +125,105 @@ cr_usage( void )
 
 int
 parse_cr(
-    const char	*fname,
-    int		lineno,
-    char	*line,
-    char	**argv )
+	struct config_args_s *c,
+	ContentRule	**scr )
 {
 	LDAPContentRule *cr;
 	int		code;
 	const char	*err;
+	char *line = strchr( c->line, '(' );
 
-	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 );
+		snprintf( c->msg, sizeof( c->msg ), "%s: %s before %s",
+			c->argv[0], ldap_scherr2str( code ), err );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
 		cr_usage();
 		return 1;
 	}
 
 	if ( cr->cr_oid == NULL ) {
-		fprintf( stderr,
-			"%s: line %d: Content rule has no OID\n",
-			fname, lineno );
+		snprintf( c->msg, sizeof( c->msg ), "%s: OID is missing",
+			c->argv[0] );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
 		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",
-			 fname, lineno, scherr2str(code), err);
-		return 1;
+		snprintf( c->msg, sizeof( c->msg ), "%s: %s: \"%s\"",
+			c->argv[0], scherr2str(code), err);
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
+		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(
-    const char	*fname,
-    int		lineno,
-    char	*line,
-    char	**argv )
+	struct config_args_s *c,
+	ObjectClass	**soc,
+	ObjectClass *prev )
 {
 	LDAPObjectClass *oc;
 	int		code;
 	const char	*err;
+	char *line = strchr( c->line, '(' );
 
 	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 );
+		snprintf( c->msg, sizeof( c->msg ), "%s: %s before %s",
+			c->argv[0], ldap_scherr2str( code ), err );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
 		oc_usage();
 		return 1;
 	}
 
 	if ( oc->oc_oid == NULL ) {
-		fprintf( stderr,
-			"%s: line %d: objectclass has no OID\n",
-			fname, lineno );
+		snprintf( c->msg, sizeof( c->msg ), "%s: OID is missing",
+			c->argv[0] );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
 		oc_usage();
-		return 1;
+		code = 1;
+		goto done;
 	}
 
-	code = oc_add(oc,1,&err);
+	code = oc_add( oc, 1, soc, prev, &err );
 	if ( code ) {
-		fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
-			 fname, lineno, scherr2str(code), err);
-		return 1;
+		snprintf( c->msg, sizeof( c->msg ), "%s: %s: \"%s\"",
+			c->argv[0], scherr2str(code), err);
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
+		code = 1;
+		goto done;
 	}
 
-	ldap_memfree(oc);
-	return 0;
+done:;
+	if ( code ) {
+		ldap_objectclass_free( oc );
+
+	} else {
+		ldap_memfree( oc );
+	}
+
+	return code;
 }
 
 static void
@@ -242,44 +271,62 @@ at_usage( void )
 
 int
 parse_at(
-    const char	*fname,
-    int		lineno,
-    char	*line,
-    char	**argv )
+	struct config_args_s *c,
+	AttributeType	**sat,
+	AttributeType	*prev )
 {
 	LDAPAttributeType *at;
 	int		code;
 	const char	*err;
+	char *line = strchr( c->line, '(' );
 
 	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 );
+		snprintf( c->msg, sizeof( c->msg ), "%s: %s before %s",
+			c->argv[0], ldap_scherr2str(code), err );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
 		at_usage();
 		return 1;
 	}
 
 	if ( at->at_oid == NULL ) {
-		fprintf( stderr,
-			"%s: line %d: attributeType has no OID\n",
-			fname, lineno );
+		snprintf( c->msg, sizeof( c->msg ), "%s: OID is missing",
+			c->argv[0] );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
 		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;
+		snprintf( c->msg, sizeof( c->msg ), "%s: \"%s\" is operational",
+			c->argv[0], at->at_oid );
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
+		code = 1;
+		goto done;
 	}
 
-	code = at_add(at,&err);
+	code = at_add( at, 1, sat, prev, &err);
 	if ( code ) {
-		fprintf( stderr, "%s: line %d: %s: \"%s\"\n",
-			 fname, lineno, scherr2str(code), err);
-		return 1;
+		snprintf( c->msg, sizeof( c->msg ), "%s: %s: \"%s\"",
+			c->argv[0], scherr2str(code), err);
+		Debug( LDAP_DEBUG_CONFIG|LDAP_DEBUG_NONE,
+			"%s %s\n", c->log, c->msg, 0 );
+		code = 1;
+		goto done;
 	}
-	ldap_memfree(at);
-	return 0;
+
+done:;
+	if ( code ) {
+		ldap_attributetype_free( at );
+
+	} else {
+		ldap_memfree( at );
+	}
+
+	return code;
 }