Additional schema routines

diff --git a/include/ldap_schema.h b/include/ldap_schema.h
index d72c801c46a5619051eaade56f4080ad3faeef26..49078d832ce23aebcbd4ab5a64a0d398b9ee2837 100644 (file)
--- a/include/ldap_schema.h
+++ b/include/ldap_schema.h
@@ -28,12 +28,14 @@ LDAP_BEGIN_DECL
 #define LDAP_SCHERR_UNEXPTOKEN         2
 #define LDAP_SCHERR_NOLEFTPAREN                3
 #define LDAP_SCHERR_NORIGHTPAREN       4
-#define LDAP_SCHERR_NODIGIT            5
-#define LDAP_SCHERR_BADNAME            6
-#define LDAP_SCHERR_BADDESC            7
-#define LDAP_SCHERR_BADSUP             8
-#define LDAP_SCHERR_DUPOPT             9
-#define LDAP_SCHERR_EMPTY              10
+#define LDAP_SCHERR_NODIGIT                    5
+#define LDAP_SCHERR_BADNAME                    6
+#define LDAP_SCHERR_BADDESC                    7
+#define LDAP_SCHERR_BADSUP                     8
+#define LDAP_SCHERR_DUPOPT                     9
+#define LDAP_SCHERR_EMPTY                      10
+#define LDAP_SCHERR_MISSING                    11
+#define LDAP_SCHERR_OUT_OF_ORDER       12
 
 typedef struct ldap_schema_extension_item {
        char *lsei_name;
@@ -109,6 +111,27 @@ typedef struct ldap_contentrule {
        LDAPSchemaExtensionItem **cr_extensions; /* OPTIONAL */
 } LDAPContentRule;
 
+typedef struct ldap_nameform {
+       char *nf_oid;           /* REQUIRED */
+       char **nf_names;        /* OPTIONAL */
+       char *nf_desc;          /* OPTIONAL */
+       int  nf_obsolete;       /* 0=no, 1=yes */
+       char *nf_objectclass;   /* REQUIRED */
+       char **nf_at_oids_must; /* REQUIRED */
+       char **nf_at_oids_may;  /* OPTIONAL */
+       LDAPSchemaExtensionItem **nf_extensions; /* OPTIONAL */
+} LDAPNameForm;
+
+typedef struct ldap_structurerule {
+       int sr_ruleid;          /* REQUIRED */
+       char **sr_names;        /* OPTIONAL */
+       char *sr_desc;          /* OPTIONAL */
+       int  sr_obsolete;       /* 0=no, 1=yes */
+       char *sr_nameform;      /* REQUIRED */
+       int sr_nsup_ruleids;/* number of sr_sup_ruleids */
+       int *sr_sup_ruleids;/* OPTIONAL */
+       LDAPSchemaExtensionItem **sr_extensions; /* OPTIONAL */
+} LDAPStructureRule;
 
 /*
  * Misc macros
@@ -129,14 +152,16 @@ typedef struct ldap_contentrule {
 /*
  * Flags that control how liberal the parsing routines are.
  */
-#define LDAP_SCHEMA_ALLOW_NONE         0x00 /* Strict parsing               */
-#define LDAP_SCHEMA_ALLOW_NO_OID       0x01 /* Allow missing oid            */
-#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_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      */
+#define LDAP_SCHEMA_ALLOW_NONE         0x00U /* Strict parsing               */
+#define LDAP_SCHEMA_ALLOW_NO_OID       0x01U /* Allow missing oid            */
+#define LDAP_SCHEMA_ALLOW_QUOTED       0x02U /* Allow bogus extra quotes     */
+#define LDAP_SCHEMA_ALLOW_DESCR                0x04U /* Allow descr instead of OID   */
+#define LDAP_SCHEMA_ALLOW_DESCR_PREFIX 0x08U /* Allow descr as OID prefix    */
+#define LDAP_SCHEMA_ALLOW_OID_MACRO    0x10U /* Allow OID macros in slapd    */
+#define LDAP_SCHEMA_ALLOW_OUT_OF_ORDER_FIELDS 0x20U /* Allow fields in most any order */
+#define LDAP_SCHEMA_ALLOW_ALL          0x3fU /* Be very liberal in parsing   */
+#define        LDAP_SCHEMA_SKIP                        0x80U /* Don't malloc any result      */
+
 
 LDAP_F( LDAP_CONST char * )
 ldap_syntax2name LDAP_P((
@@ -162,6 +187,14 @@ LDAP_F( LDAP_CONST char * )
 ldap_contentrule2name LDAP_P((
        LDAPContentRule * cr ));
 
+LDAP_F( LDAP_CONST char * )
+ldap_nameform2name LDAP_P((
+       LDAPNameForm * nf ));
+
+LDAP_F( LDAP_CONST char * )
+ldap_structurerule2name LDAP_P((
+       LDAPStructureRule * sr ));
+
 LDAP_F( void )
 ldap_syntax_free LDAP_P((
        LDAPSyntax * syn ));
@@ -186,55 +219,85 @@ LDAP_F( void )
 ldap_contentrule_free LDAP_P((
        LDAPContentRule * cr ));
 
-LDAP_F( LDAPObjectClass * )
-ldap_str2objectclass LDAP_P((
+LDAP_F( void )
+ldap_nameform_free LDAP_P((
+       LDAPNameForm * nf ));
+
+LDAP_F( void )
+ldap_structurerule_free LDAP_P((
+       LDAPStructureRule * sr ));
+
+LDAP_F( LDAPStructureRule * )
+ldap_str2structurerule LDAP_P((
+       LDAP_CONST char * s,
+       int * code,
+       LDAP_CONST char ** errp,
+       LDAP_CONST unsigned flags ));
+
+LDAP_F( LDAPNameForm * )
+ldap_str2nameform LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
-       LDAP_CONST int flags ));
+       LDAP_CONST unsigned flags ));
 
 LDAP_F( LDAPContentRule * )
 ldap_str2contentrule LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
-       LDAP_CONST int flags ));
+       LDAP_CONST unsigned flags ));
+
+LDAP_F( LDAPObjectClass * )
+ldap_str2objectclass LDAP_P((
+       LDAP_CONST char * s,
+       int * code,
+       LDAP_CONST char ** errp,
+       LDAP_CONST unsigned flags ));
 
 LDAP_F( LDAPAttributeType * )
 ldap_str2attributetype LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
-       LDAP_CONST int flags ));
+       LDAP_CONST unsigned flags ));
 
 LDAP_F( LDAPSyntax * )
 ldap_str2syntax LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
-       LDAP_CONST int flags ));
+       LDAP_CONST unsigned flags ));
 
 LDAP_F( LDAPMatchingRule * )
 ldap_str2matchingrule LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
-       LDAP_CONST int flags ));
+       LDAP_CONST unsigned flags ));
 
 LDAP_F( LDAPMatchingRuleUse * )
 ldap_str2matchingruleuse LDAP_P((
        LDAP_CONST char * s,
        int * code,
        LDAP_CONST char ** errp,
-       LDAP_CONST int flags ));
+       LDAP_CONST unsigned flags ));
 
 LDAP_F( char * )
-ldap_objectclass2str LDAP_P((
-       LDAPObjectClass * oc ));
+ldap_structurerule2str LDAP_P((
+       LDAPStructureRule * sr ));
 
 LDAP_F( struct berval * )
-ldap_objectclass2bv LDAP_P((
-       LDAPObjectClass * oc, struct berval *bv ));
+ldap_structurerule2bv LDAP_P((
+       LDAPStructureRule * sr, struct berval *bv ));
+
+LDAP_F( char * )
+ldap_nameform2str LDAP_P((
+       LDAPNameForm * nf ));
+
+LDAP_F( struct berval * )
+ldap_nameform2bv LDAP_P((
+       LDAPNameForm * nf, struct berval *bv ));
 
 LDAP_F( char * )
 ldap_contentrule2str LDAP_P((
@@ -244,6 +307,14 @@ LDAP_F( struct berval * )
 ldap_contentrule2bv LDAP_P((
        LDAPContentRule * cr, struct berval *bv ));
 
+LDAP_F( char * )
+ldap_objectclass2str LDAP_P((
+       LDAPObjectClass * oc ));
+
+LDAP_F( struct berval * )
+ldap_objectclass2bv LDAP_P((
+       LDAPObjectClass * oc, struct berval *bv ));
+
 LDAP_F( char * )
 ldap_attributetype2str LDAP_P((
        LDAPAttributeType * at ));