X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fschemaparse.c;h=16addf4a16029a93b3c64d811e1bb8b46214c044;hb=af866c3b44ba37577671f2bffd482499f4b8bc00;hp=6205f382fba2aa653325b7a9e5600601449b7fd9;hpb=fda3d6260e25f1d0b9c035b0d520b2c9d0f22e49;p=openldap

diff --git a/servers/slapd/schemaparse.c b/servers/slapd/schemaparse.c
index 6205f382fb..16addf4a16 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-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2005 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -25,6 +25,8 @@
 #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);
 
@@ -124,7 +126,8 @@ parse_cr(
     const char	*fname,
     int		lineno,
     char	*line,
-    char	**argv )
+    char	**argv,
+	ContentRule **scr )
 {
 	LDAPContentRule *cr;
 	int		code;
@@ -146,7 +149,7 @@ parse_cr(
 		return 1;
 	}
 
-	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);
@@ -162,7 +165,8 @@ parse_oc(
     const char	*fname,
     int		lineno,
     char	*line,
-    char	**argv )
+    char	**argv,
+	ObjectClass **soc )
 {
 	LDAPObjectClass *oc;
 	int		code;
@@ -184,7 +188,7 @@ parse_oc(
 		return 1;
 	}
 
-	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);
@@ -243,7 +247,8 @@ parse_at(
     const char	*fname,
     int		lineno,
     char	*line,
-    char	**argv )
+    char	**argv,
+	AttributeType **sat )
 {
 	LDAPAttributeType *at;
 	int		code;
@@ -272,7 +277,7 @@ parse_at(
 		return 1;
 	}
 
-	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);