Misc DESC updates

[openldap] / include / ldap_schema.h

diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index a4bd8b89bf5d685546a8ec09d8579ae34d24fdd6..1dbc6b0647b44c84852e29feb06530d6869c58a9 100644 (file)
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -1,16 +1,18 @@
 /* $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
  *             used by both clients and servers.
+ * these routines should be renamed ldap_x_...
  */
 
 #ifndef _LDAP_SCHEMA_H
@@ -114,7 +116,8 @@ 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   */
 
 LDAP_F( LDAP_CONST char * )
 ldap_syntax2name LDAP_P((