add feature macros

[openldap] / include / ldap_schema.h

diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index c8722d5251623d17e003a6cf7be52ff6e1fb437f..4c8e5fb448045ce92476fe56648f1862a00f993e 100644 (file)
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -1,6 +1,6 @@
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2001 The OpenLDAP Foundation, Redwood City, California, USA
+ * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116,7 +116,9 @@ 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   */
+#define        LDAP_SCHEMA_SKIP                0x80 /* Don't malloc any result      */
 
 LDAP_F( LDAP_CONST char * )
 ldap_syntax2name LDAP_P((
@@ -195,23 +197,43 @@ ldap_str2matchingruleuse LDAP_P((
 
 LDAP_F( char * )
 ldap_objectclass2str LDAP_P((
-       LDAP_CONST LDAPObjectClass * oc ));
+       LDAPObjectClass * oc ));
+
+LDAP_F( struct berval * )
+ldap_objectclass2bv LDAP_P((
+       LDAPObjectClass * oc, struct berval *bv ));
 
 LDAP_F( char * )
 ldap_attributetype2str LDAP_P((
-       LDAP_CONST LDAPAttributeType * at ));
+       LDAPAttributeType * at ));
+
+LDAP_F( struct berval * )
+ldap_attributetype2bv LDAP_P((
+       LDAPAttributeType * at, struct berval *bv ));
 
 LDAP_F( char * )
 ldap_syntax2str LDAP_P((
-       LDAP_CONST LDAPSyntax * syn ));
+       LDAPSyntax * syn ));
+
+LDAP_F( struct berval * )
+ldap_syntax2bv LDAP_P((
+       LDAPSyntax * syn, struct berval *bv ));
 
 LDAP_F( char * )
 ldap_matchingrule2str LDAP_P((
-       LDAP_CONST LDAPMatchingRule * mr ));
+       LDAPMatchingRule * mr ));
+
+LDAP_F( struct berval * )
+ldap_matchingrule2bv LDAP_P((
+       LDAPMatchingRule * mr, struct berval *bv ));
 
 LDAP_F( char * )
 ldap_matchingruleuse2str LDAP_P((
-       LDAP_CONST LDAPMatchingRuleUse * mru ));
+       LDAPMatchingRuleUse * mru ));
+
+LDAP_F( struct berval * )
+ldap_matchingruleuse2bv LDAP_P((
+       LDAPMatchingRuleUse * mru, struct berval *bv ));
 
 LDAP_F( char * )
 ldap_scherr2str LDAP_P((