X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fldap_schema.h;h=35933cdfb773f025e3dadd3d837f9ea11e4e00df;hb=13bdb1ea8f184255998cf83eef4170a8a92c48af;hp=ec29616445569f1d2d3d1e58eec3d5db2bf9ad8b;hpb=3b15c6f10fe0c205a6a2c263483eb896e13cc79d;p=openldap

diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index ec29616445..35933cdfb7 100644
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -1,12 +1,13 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1999-2000 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms are permitted only
- * as authorized by the OpenLDAP Public License.  A copy of this
- * license is available at http://www.OpenLDAP.org/license.html or
- * in file LICENSE in the top-level directory of the distribution.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.  A copy of this license is available at
+ * http://www.OpenLDAP.org/license.html or in file LICENSE in the
+ * top-level directory of the distribution.
  */
 /*
  * ldap-schema.h - Header for basic schema handling functions that can be
@@ -36,14 +37,14 @@ LDAP_BEGIN_DECL
 typedef struct ldap_schema_extension_item {
 	char *lsei_name;
 	char **lsei_values;
-} LDAP_SCHEMA_EXTENSION_ITEM;
+} LDAPSchemaExtensionItem;
 
 typedef struct ldap_syntax {
 	char *syn_oid;		/* REQUIRED */
 	char **syn_names;	/* OPTIONAL */
 	char *syn_desc;		/* OPTIONAL */
-	LDAP_SCHEMA_EXTENSION_ITEM **syn_extensions; /* OPTIONAL */
-} LDAP_SYNTAX;
+	LDAPSchemaExtensionItem **syn_extensions; /* OPTIONAL */
+} LDAPSyntax;
 
 typedef struct ldap_matchingrule {
 	char *mr_oid;		/* REQUIRED */
@@ -51,8 +52,8 @@ typedef struct ldap_matchingrule {
 	char *mr_desc;		/* OPTIONAL */
 	int  mr_obsolete;	/* OPTIONAL */
 	char *mr_syntax_oid;	/* REQUIRED */
-	LDAP_SCHEMA_EXTENSION_ITEM **mr_extensions; /* OPTIONAL */
-} LDAP_MATCHING_RULE;
+	LDAPSchemaExtensionItem **mr_extensions; /* OPTIONAL */
+} LDAPMatchingRule;
 
 typedef struct ldap_attributetype {
 	char *at_oid;		/* REQUIRED */
@@ -70,8 +71,8 @@ typedef struct ldap_attributetype {
 	int  at_no_user_mod;	/* 0=no, 1=yes */
 	int  at_usage;		/* 0=userApplications, 1=directoryOperation,
 				   2=distributedOperation, 3=dSAOperation */
-	LDAP_SCHEMA_EXTENSION_ITEM **at_extensions; /* OPTIONAL */
-} LDAP_ATTRIBUTE_TYPE;
+	LDAPSchemaExtensionItem **at_extensions; /* OPTIONAL */
+} LDAPAttributeType;
 
 typedef struct ldap_objectclass {
 	char *oc_oid;		/* REQUIRED */
@@ -82,8 +83,8 @@ typedef struct ldap_objectclass {
 	int  oc_kind;		/* 0=ABSTRACT, 1=STRUCTURAL, 2=AUXILIARY */
 	char **oc_at_oids_must;	/* OPTIONAL */
 	char **oc_at_oids_may;	/* OPTIONAL */
-	LDAP_SCHEMA_EXTENSION_ITEM **oc_extensions; /* OPTIONAL */
-} LDAP_OBJECT_CLASS;
+	LDAPSchemaExtensionItem **oc_extensions; /* OPTIONAL */
+} LDAPObjectClass;
 
 #define LDAP_SCHEMA_NO				0
 #define LDAP_SCHEMA_YES				1
@@ -105,85 +106,86 @@ typedef struct ldap_objectclass {
 #define LDAP_SCHEMA_ALLOW_QUOTED	0x02 /* Allow bogus extra quotes     */
 #define LDAP_SCHEMA_ALLOW_DESCR		0x04 /* Allow descr instead of OID   */
 #define LDAP_SCHEMA_ALLOW_DESCR_PREFIX	0x08 /* Allow descr as OID prefix    */
-#define LDAP_SCHEMA_ALLOW_ALL		0x0f /* Be very liberal in parsing   */
+#define LDAP_SCHEMA_ALLOW_OID_MACRO	0x10 /* Allow OID macros in slapd    */
+#define LDAP_SCHEMA_ALLOW_ALL		0x1f /* Be very liberal in parsing   */
 
-LIBLDAP_F( LDAP_CONST char * )
+LDAP_F( LDAP_CONST char * )
 ldap_syntax2name LDAP_P((
-	LDAP_SYNTAX * syn ));
+	LDAPSyntax * syn ));
 
-LIBLDAP_F( LDAP_CONST char * )
+LDAP_F( LDAP_CONST char * )
 ldap_matchingrule2name LDAP_P((
-	LDAP_MATCHING_RULE * mr ));
+	LDAPMatchingRule * mr ));
 
-LIBLDAP_F( LDAP_CONST char * )
+LDAP_F( LDAP_CONST char * )
 ldap_attributetype2name LDAP_P((
-	LDAP_ATTRIBUTE_TYPE * at ));
+	LDAPAttributeType * at ));
 
-LIBLDAP_F( LDAP_CONST char * )
+LDAP_F( LDAP_CONST char * )
 ldap_objectclass2name LDAP_P((
-	LDAP_OBJECT_CLASS * oc ));
+	LDAPObjectClass * oc ));
 
-LIBLDAP_F( void )
+LDAP_F( void )
 ldap_syntax_free LDAP_P((
-	LDAP_SYNTAX * syn ));
+	LDAPSyntax * syn ));
 
-LIBLDAP_F( void )
+LDAP_F( void )
 ldap_matchingrule_free LDAP_P((
-	LDAP_MATCHING_RULE * mr ));
+	LDAPMatchingRule * mr ));
 
-LIBLDAP_F( void )
+LDAP_F( void )
 ldap_attributetype_free LDAP_P((
-	LDAP_ATTRIBUTE_TYPE * at ));
+	LDAPAttributeType * at ));
 
-LIBLDAP_F( void )
+LDAP_F( void )
 ldap_objectclass_free LDAP_P((
-	LDAP_OBJECT_CLASS * oc ));
+	LDAPObjectClass * oc ));
 
-LIBLDAP_F( LDAP_OBJECT_CLASS * )
+LDAP_F( LDAPObjectClass * )
 ldap_str2objectclass LDAP_P((
 	LDAP_CONST char * s,
 	int * code,
 	LDAP_CONST char ** errp,
 	LDAP_CONST int flags ));
 
-LIBLDAP_F( LDAP_ATTRIBUTE_TYPE * )
+LDAP_F( LDAPAttributeType * )
 ldap_str2attributetype LDAP_P((
 	LDAP_CONST char * s,
 	int * code,
 	LDAP_CONST char ** errp,
 	LDAP_CONST int flags ));
 
-LIBLDAP_F( LDAP_SYNTAX * )
+LDAP_F( LDAPSyntax * )
 ldap_str2syntax LDAP_P((
 	LDAP_CONST char * s,
 	int * code,
 	LDAP_CONST char ** errp,
 	LDAP_CONST int flags ));
 
-LIBLDAP_F( LDAP_MATCHING_RULE * )
+LDAP_F( LDAPMatchingRule * )
 ldap_str2matchingrule LDAP_P((
 	LDAP_CONST char * s,
 	int * code,
 	LDAP_CONST char ** errp,
 	LDAP_CONST int flags ));
 
-LIBLDAP_F( char *)
+LDAP_F( char * )
 ldap_objectclass2str LDAP_P((
-	LDAP_CONST LDAP_OBJECT_CLASS * oc ));
+	LDAP_CONST LDAPObjectClass * oc ));
 
-LIBLDAP_F( char *)
+LDAP_F( char * )
 ldap_attributetype2str LDAP_P((
-	LDAP_CONST LDAP_ATTRIBUTE_TYPE * at ));
+	LDAP_CONST LDAPAttributeType * at ));
 
-LIBLDAP_F( char *)
+LDAP_F( char * )
 ldap_syntax2str LDAP_P((
-	LDAP_CONST LDAP_SYNTAX * syn ));
+	LDAP_CONST LDAPSyntax * syn ));
 
-LIBLDAP_F( char *)
+LDAP_F( char * )
 ldap_matchingrule2str LDAP_P((
-	LDAP_CONST LDAP_MATCHING_RULE * mr ));
+	LDAP_CONST LDAPMatchingRule * mr ));
 
-LIBLDAP_F( char *)
+LDAP_F( char * )
 ldap_scherr2str LDAP_P((
 	int code )) LDAP_GCCATTR((const));