Diff for /include/ldap_schema.h between versions 1.29 and 1.29.2.3

version 1.29, 2002/01/04 19:40:30 version 1.29.2.3, 2003/03/03 17:10:03
Line 1 Line 1
 /* $OpenLDAP: pkg/ldap/include/ldap_schema.h,v 1.28 2001/12/30 08:42:58 hyc Exp $ */  /* $OpenLDAP: pkg/ldap/include/ldap_schema.h,v 1.29.2.2 2002/10/17 15:02:54 kurt Exp $ */
 /*  /*
  * Copyright 1998-2002 The OpenLDAP Foundation, Redwood City, California, USA   * Copyright 1998-2003 The OpenLDAP Foundation, Redwood City, California, USA
  * All rights reserved.   * All rights reserved.
  *   *
  * Redistribution and use in source and binary forms, with or without   * Redistribution and use in source and binary forms, with or without
Line 28  LDAP_BEGIN_DECL Line 28  LDAP_BEGIN_DECL
 #define LDAP_SCHERR_UNEXPTOKEN          2  #define LDAP_SCHERR_UNEXPTOKEN          2
 #define LDAP_SCHERR_NOLEFTPAREN         3  #define LDAP_SCHERR_NOLEFTPAREN         3
 #define LDAP_SCHERR_NORIGHTPAREN        4  #define LDAP_SCHERR_NORIGHTPAREN        4
 #define LDAP_SCHERR_NODIGIT             5  #define LDAP_SCHERR_NODIGIT                     5
 #define LDAP_SCHERR_BADNAME             6  #define LDAP_SCHERR_BADNAME                     6
 #define LDAP_SCHERR_BADDESC             7  #define LDAP_SCHERR_BADDESC                     7
 #define LDAP_SCHERR_BADSUP              8  #define LDAP_SCHERR_BADSUP                      8
 #define LDAP_SCHERR_DUPOPT              9  #define LDAP_SCHERR_DUPOPT                      9
 #define LDAP_SCHERR_EMPTY               10  #define LDAP_SCHERR_EMPTY                       10
   #define LDAP_SCHERR_MISSING                     11
   #define LDAP_SCHERR_OUT_OF_ORDER        12
   
 typedef struct ldap_schema_extension_item {  typedef struct ldap_schema_extension_item {
         char *lsei_name;          char *lsei_name;
Line 96  typedef struct ldap_objectclass { Line 98  typedef struct ldap_objectclass {
         LDAPSchemaExtensionItem **oc_extensions; /* OPTIONAL */          LDAPSchemaExtensionItem **oc_extensions; /* OPTIONAL */
 } LDAPObjectClass;  } LDAPObjectClass;
   
   typedef struct ldap_contentrule {
           char *cr_oid;           /* REQUIRED */
           char **cr_names;        /* OPTIONAL */
           char *cr_desc;          /* OPTIONAL */
           char **cr_sup_oids;     /* OPTIONAL */
           int  cr_obsolete;       /* 0=no, 1=yes */
           char **cr_oc_oids_aux;  /* OPTIONAL */
           char **cr_at_oids_must; /* OPTIONAL */
           char **cr_at_oids_may;  /* OPTIONAL */
           char **cr_at_oids_not;  /* OPTIONAL */
           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
    */
 #define LDAP_SCHEMA_NO                          0  #define LDAP_SCHEMA_NO                          0
 #define LDAP_SCHEMA_YES                         1  #define LDAP_SCHEMA_YES                         1
   
Line 108  typedef struct ldap_objectclass { Line 148  typedef struct ldap_objectclass {
 #define LDAP_SCHEMA_STRUCTURAL                  1  #define LDAP_SCHEMA_STRUCTURAL                  1
 #define LDAP_SCHEMA_AUXILIARY                   2  #define LDAP_SCHEMA_AUXILIARY                   2
   
   
 /*  /*
  * Flags that control how liberal the parsing routines are.   * Flags that control how liberal the parsing routines are.
  */   */
 #define LDAP_SCHEMA_ALLOW_NONE          0x00 /* Strict parsing               */  #define LDAP_SCHEMA_ALLOW_NONE          0x00U /* Strict parsing               */
 #define LDAP_SCHEMA_ALLOW_NO_OID        0x01 /* Allow missing oid            */  #define LDAP_SCHEMA_ALLOW_NO_OID        0x01U /* Allow missing oid            */
 #define LDAP_SCHEMA_ALLOW_QUOTED        0x02 /* Allow bogus extra quotes     */  #define LDAP_SCHEMA_ALLOW_QUOTED        0x02U /* Allow bogus extra quotes     */
 #define LDAP_SCHEMA_ALLOW_DESCR         0x04 /* Allow descr instead of OID   */  #define LDAP_SCHEMA_ALLOW_DESCR         0x04U /* Allow descr instead of OID   */
 #define LDAP_SCHEMA_ALLOW_DESCR_PREFIX  0x08 /* Allow descr as OID prefix    */  #define LDAP_SCHEMA_ALLOW_DESCR_PREFIX  0x08U /* Allow descr as OID prefix    */
 #define LDAP_SCHEMA_ALLOW_OID_MACRO     0x10 /* Allow OID macros in slapd    */  #define LDAP_SCHEMA_ALLOW_OID_MACRO     0x10U /* Allow OID macros in slapd    */
 #define LDAP_SCHEMA_ALLOW_ALL           0x1f /* Be very liberal in parsing   */  #define LDAP_SCHEMA_ALLOW_OUT_OF_ORDER_FIELDS 0x20U /* Allow fields in most any order */
 #define LDAP_SCHEMA_SKIP                0x80 /* Don't malloc any result      */  #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_F( LDAP_CONST char * )
 ldap_syntax2name LDAP_P((  ldap_syntax2name LDAP_P((
Line 140  LDAP_F( LDAP_CONST char * ) Line 183  LDAP_F( LDAP_CONST char * )
 ldap_objectclass2name LDAP_P((  ldap_objectclass2name LDAP_P((
         LDAPObjectClass * oc ));          LDAPObjectClass * oc ));
   
   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_F( void )
 ldap_syntax_free LDAP_P((  ldap_syntax_free LDAP_P((
         LDAPSyntax * syn ));          LDAPSyntax * syn ));
Line 160  LDAP_F( void ) Line 215  LDAP_F( void )
 ldap_objectclass_free LDAP_P((  ldap_objectclass_free LDAP_P((
         LDAPObjectClass * oc ));          LDAPObjectClass * oc ));
   
   LDAP_F( void )
   ldap_contentrule_free LDAP_P((
           LDAPContentRule * cr ));
   
   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 unsigned flags ));
   
   LDAP_F( LDAPContentRule * )
   ldap_str2contentrule LDAP_P((
           LDAP_CONST char * s,
           int * code,
           LDAP_CONST char ** errp,
           LDAP_CONST unsigned flags ));
   
 LDAP_F( LDAPObjectClass * )  LDAP_F( LDAPObjectClass * )
 ldap_str2objectclass LDAP_P((  ldap_str2objectclass LDAP_P((
         LDAP_CONST char * s,          LDAP_CONST char * s,
         int * code,          int * code,
         LDAP_CONST char ** errp,          LDAP_CONST char ** errp,
         LDAP_CONST int flags ));          LDAP_CONST unsigned flags ));
   
 LDAP_F( LDAPAttributeType * )  LDAP_F( LDAPAttributeType * )
 ldap_str2attributetype LDAP_P((  ldap_str2attributetype LDAP_P((
         LDAP_CONST char * s,          LDAP_CONST char * s,
         int * code,          int * code,
         LDAP_CONST char ** errp,          LDAP_CONST char ** errp,
         LDAP_CONST int flags ));          LDAP_CONST unsigned flags ));
   
 LDAP_F( LDAPSyntax * )  LDAP_F( LDAPSyntax * )
 ldap_str2syntax LDAP_P((  ldap_str2syntax LDAP_P((
         LDAP_CONST char * s,          LDAP_CONST char * s,
         int * code,          int * code,
         LDAP_CONST char ** errp,          LDAP_CONST char ** errp,
         LDAP_CONST int flags ));          LDAP_CONST unsigned flags ));
   
 LDAP_F( LDAPMatchingRule * )  LDAP_F( LDAPMatchingRule * )
 ldap_str2matchingrule LDAP_P((  ldap_str2matchingrule LDAP_P((
         LDAP_CONST char * s,          LDAP_CONST char * s,
         int * code,          int * code,
         LDAP_CONST char ** errp,          LDAP_CONST char ** errp,
         LDAP_CONST int flags ));          LDAP_CONST unsigned flags ));
   
 LDAP_F( LDAPMatchingRuleUse * )  LDAP_F( LDAPMatchingRuleUse * )
 ldap_str2matchingruleuse LDAP_P((  ldap_str2matchingruleuse LDAP_P((
         LDAP_CONST char * s,          LDAP_CONST char * s,
         int * code,          int * code,
         LDAP_CONST char ** errp,          LDAP_CONST char ** errp,
         LDAP_CONST int flags ));          LDAP_CONST unsigned flags ));
   
   LDAP_F( char * )
   ldap_structurerule2str LDAP_P((
           LDAPStructureRule * sr ));
   
   LDAP_F( struct berval * )
   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((
           LDAPContentRule * cr ));
   
   LDAP_F( struct berval * )
   ldap_contentrule2bv LDAP_P((
           LDAPContentRule * cr, struct berval *bv ));
   
 LDAP_F( char * )  LDAP_F( char * )
 ldap_objectclass2str LDAP_P((  ldap_objectclass2str LDAP_P((

Removed from v.1.29  
changed lines
  Added in v.1.29.2.3


______________
© Copyright 1998-2020, OpenLDAP Foundation, info@OpenLDAP.org