Fixing bug in extensible filter indexing

[openldap] / include / ldap.h

diff --git a/include/ldap.h b/include/ldap.h
index f5f2a334e6371b14f490956567cbf320d4258749..f8811c7ad3140a3f1e976f2baabd1f6240a5bc3a 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -76,6 +76,9 @@ LDAP_BEGIN_DECL
 #define LDAP_ALL_USER_ATTRIBUTES       "*"
 #define LDAP_ALL_OPERATIONAL_ATTRIBUTES        "+" /* RFC 3673 */
 
+/* RFC 2251:  maxInt INTEGER ::= 2147483647 -- (2^^31 - 1) -- */
+#define LDAP_MAXINT (2147483647)
+
 /*
  * LDAP_OPTions
  *     0x0000 - 0x0fff reserved for api options
@@ -116,6 +119,7 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_NETWORK_TIMEOUT       0x5005  /* socket level timeout */
 #define LDAP_OPT_URI                           0x5006
 #define LDAP_OPT_REFERRAL_URLS      0x5007  /* Referral URLs */
+#define LDAP_OPT_SOCKBUF            0x5008  /* sockbuf */
 
 /* OpenLDAP TLS options */
 #define LDAP_OPT_X_TLS                         0x6000
@@ -129,6 +133,9 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_X_TLS_CIPHER_SUITE    0x6008
 #define LDAP_OPT_X_TLS_RANDOM_FILE     0x6009
 #define LDAP_OPT_X_TLS_SSL_CTX         0x600a
+#define LDAP_OPT_X_TLS_CRLCHECK                0x600b
+#define LDAP_OPT_X_TLS_CONNECT_CB      0x600c
+#define LDAP_OPT_X_TLS_CONNECT_ARG     0x600d
 
 #define LDAP_OPT_X_TLS_NEVER   0
 #define LDAP_OPT_X_TLS_HARD            1
@@ -136,6 +143,10 @@ LDAP_BEGIN_DECL
 #define LDAP_OPT_X_TLS_ALLOW   3
 #define LDAP_OPT_X_TLS_TRY             4
 
+#define LDAP_OPT_X_TLS_CRL_NONE        0
+#define LDAP_OPT_X_TLS_CRL_PEER        1
+#define LDAP_OPT_X_TLS_CRL_ALL 2
+
 /* OpenLDAP SASL options */
 #define LDAP_OPT_X_SASL_MECH                   0x6100
 #define LDAP_OPT_X_SASL_REALM                  0x6101
@@ -223,8 +234,10 @@ typedef struct ldapcontrol {
 #define LDAP_CONTROL_VLVRESPONSE    "2.16.840.1.113730.3.4.10"
 
 /* Password policy Controls *//* work in progress */
+#ifdef LDAP_DEVEL
 #define LDAP_CONTROL_PASSWORDPOLICYREQUEST     "1.3.6.1.4.1.42.2.27.8.5.1"
 #define LDAP_CONTROL_PASSWORDPOLICYRESPONSE    "1.3.6.1.4.1.42.2.27.8.5.1"
+#endif
 
 /* LDAP Sync -- draft-zeilenga-ldup-sync *//* submitted for publication */
 #define LDAP_SYNC_OID                  "1.3.6.1.4.1.4203.1.9.1"
@@ -282,6 +295,7 @@ typedef struct ldapcontrol {
 #define LDAP_EXOP_X_CANCEL             "1.3.6.1.4.1.4203.666.6.3"
 
 /* LDAP Grouping of Related Operations *//* a work in progress */
+#ifdef LDAP_DEVEL
 #define LDAP_X_GROUPING_BASE           "1.3.6.1.4.1.4203.666.10.3"
 #define LDAP_EXOP_GROUPING_CREATE      LDAP_X_GROUPING_BASE ".1"
 #define LDAP_EXOP_GROUPING_END         LDAP_X_GROUPING_BASE ".2"
@@ -289,9 +303,12 @@ typedef struct ldapcontrol {
 #define LDAP_EXOP_GROUPING_ACTION      LDAP_X_GROUPING_BASE ".4"
 #define LDAP_NOTICE_GROUPING_INFO      LDAP_X_GROUPING_BASE ".5"
 #define LDAP_CONTROL_GROUPING          LDAP_X_GROUPING_BASE ".6"
+#endif
 
 /* LDAP Grouping Types *//* a work in progress */
+#ifdef LDAP_DEVEL
 #define LDAP_GROUP_TRANSACTION          "1.3.6.1.4.1.4203.666.10.4"
+#endif
 
 /* LDAP Features */
 #define LDAP_FEATURE_ALL_OP_ATTRS      "1.3.6.1.4.1.4203.1.5.1"        /* RFC 3673 */
@@ -300,11 +317,13 @@ typedef struct ldapcontrol {
 #define LDAP_FEATURE_ABSOLUTE_FILTERS "1.3.6.1.4.1.4203.1.5.3"  /* (&) (|) */
 #define LDAP_FEATURE_LANGUAGE_TAG_OPTIONS "1.3.6.1.4.1.4203.1.5.4"
 #define LDAP_FEATURE_LANGUAGE_RANGE_OPTIONS "1.3.6.1.4.1.4203.1.5.5"
+#define LDAP_FEATURE_MODIFY_INCREMENT "1.3.6.1.4.1.4203.666.8.2"
 
+#ifdef LDAP_DEVEL
 #define LDAP_FEATURE_SUBORDINATE_SCOPE \
        "1.3.6.1.4.1.4203.666.8.1" /* "children" */
 #define LDAP_FEATURE_CHILDREN_SCOPE LDAP_FEATURE_SUBORDINATE_SCOPE
-#define LDAP_FEATURE_MODIFY_INCREMENT "1.3.6.1.4.1.4203.666.8.2"
+#endif
 
 /*
  * specific LDAP instantiations of BER types we know about
@@ -344,6 +363,9 @@ typedef struct ldapcontrol {
 #define LDAP_TAG_EXOP_RES_OID   ((ber_tag_t) 0x8aU)    /* context specific + primitive */
 #define LDAP_TAG_EXOP_RES_VALUE ((ber_tag_t) 0x8bU)    /* context specific + primitive */
 
+#define LDAP_TAG_IM_RES_OID   ((ber_tag_t) 0x80U)      /* context specific + primitive */
+#define LDAP_TAG_IM_RES_VALUE ((ber_tag_t) 0x81U)      /* context specific + primitive */
+
 #define LDAP_TAG_SASL_RES_CREDS        ((ber_tag_t) 0x87U)     /* context specific + primitive */
 
 /* LDAP Request Messages */
@@ -424,8 +446,10 @@ typedef struct ldapcontrol {
 #define LDAP_SCOPE_ONE                 LDAP_SCOPE_ONELEVEL
 #define LDAP_SCOPE_SUBTREE             ((ber_int_t) 0x0002)
 #define LDAP_SCOPE_SUB                 LDAP_SCOPE_SUBTREE
+#ifdef LDAP_DEVEL
 #define LDAP_SCOPE_SUBORDINATE ((ber_int_t) 0x0003) /* OpenLDAP extension */
 #define LDAP_SCOPE_CHILDREN            LDAP_SCOPE_SUBORDINATE
+#endif
 
 /* substring filter component types */
 #define LDAP_SUBSTRING_INITIAL ((ber_tag_t) 0x80U)     /* context specific */
@@ -742,9 +766,10 @@ ldap_parse_intermediate LDAP_P((
 /*
  * in groupings.c:
  */
+#ifdef LDAP_EXOP_GROUPING_CREATE
 
 LDAP_F( int )
-ldap_grouping_create_operation LDAP_P((
+ldap_grouping_create LDAP_P((
        LDAP                    *ld,
        LDAP_CONST char *grpoid,
        struct berval   *grpdata,
@@ -753,7 +778,7 @@ ldap_grouping_create_operation LDAP_P((
        int                             *msgidp ));
 
 LDAP_F( int )
-ldap_grouping_create_operation_s LDAP_P((
+ldap_grouping_create_s LDAP_P((
        LDAP                    *ld,
        LDAP_CONST char *grpoid,
        struct berval   *grpdata,
@@ -772,7 +797,7 @@ ldap_parse_grouping_create_result LDAP_P((
        int                             freeit ));
 
 LDAP_F( int )
-ldap_grouping_end_operation LDAP_P((
+ldap_grouping_end LDAP_P((
        LDAP                    *ld,
        LDAP_CONST char *grpoid,
        struct berval   *grpdata,
@@ -781,7 +806,7 @@ ldap_grouping_end_operation LDAP_P((
        int                             *msgidp ));
 
 LDAP_F( int )
-ldap_grouping_end_operation_s LDAP_P((
+ldap_grouping_end_s LDAP_P((
        LDAP                    *ld,
        LDAP_CONST char *grpoid,
        struct berval   *grpdata,
@@ -842,6 +867,7 @@ ldap_parse_grouping_info_notice LDAP_P((
        struct berval   **retgrpcookiep,
        struct berval   **retgrpdatap,
        int                             freeit ));
+#endif
 
 /*
  * in abandon.c:
@@ -1844,6 +1870,7 @@ ldap_parse_vlv_control LDAP_P((
  * LDAP Transactions
  *     in txn.c
  */
+#ifdef LDAP_GROUPING_TRANSACTION
 LDAP_F( int )
 ldap_parse_txn_create LDAP_P((
        LDAP *ld,
@@ -1880,6 +1907,7 @@ ldap_txn_end_s LDAP_P((
        int commit,
        LDAPControl **sctrls,
        LDAPControl **cctrls ));
+#endif
 
 /*
  * LDAP Who Am I?
@@ -1972,7 +2000,6 @@ ldap_parse_passwordpolicy_control LDAP_P((
 
 LDAP_F( const char * )
 ldap_passwordpolicy_err2txt LDAP_P(( LDAPPasswordPolicyError ));
-
 #endif /* LDAP_CONTROL_PASSWORDPOLICYREQUEST */
 
 LDAP_END_DECL