/* $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
#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);
"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",
"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 *
const char *fname,
int lineno,
char *line,
- char **argv )
+ char **argv,
+ ContentRule **scr )
{
LDAPContentRule *cr;
int code;
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);
const char *fname,
int lineno,
char *line,
- char **argv )
+ char **argv,
+ ObjectClass **soc )
{
LDAPObjectClass *oc;
int code;
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);
const char *fname,
int lineno,
char *line,
- char **argv )
+ char **argv,
+ AttributeType **sat )
{
LDAPAttributeType *at;
int code;
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);