Fix previous commit

[openldap] / servers / slapd / slap.h

diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h
index 68f86064198d26a776c4312ac5a0cc1d23f50b09..4c1e7c0819cccc9480a12e5ece310db0d0e3dd89 100644 (file)
--- a/servers/slapd/slap.h
+++ b/servers/slapd/slap.h
@@ -69,14 +69,13 @@ LDAP_BEGIN_DECL
  */
 #define SLAP_MOD_SOFTADD       0x1000
 
-#define ON     (1)
-#define OFF    (-1)
-#define UNDEFINED (0)
-
 #define MAXREMATCHES (10)
 
 #define SLAP_MAX_WORKER_THREADS                (32)
 
+#define SLAP_SB_MAX_INCOMING_DEFAULT ((1<<18) - 1)
+#define SLAP_SB_MAX_INCOMING_AUTH ((1<<24) - 1)
+
 #define SLAP_TEXT_BUFLEN (256)
 
 /* psuedo error code indicating abandoned operation */
@@ -176,7 +175,7 @@ typedef struct slap_ssf_set {
 
 #define SLAP_INDEX_DEFAULT        SLAP_INDEX_EQUALITY
 
-#define IS_SLAP_INDEX(mask, type)      (((mask) & (type)) == (type) )
+#define IS_SLAP_INDEX(mask, type)      (((mask) & (type)) == (type))
 
 #define SLAP_INDEX_SUBSTR_TYPE    0x0F00UL
 
@@ -196,7 +195,6 @@ typedef struct slap_ssf_set {
 #define SLAP_INDEX_FLAGS         0xF000UL
 #define SLAP_INDEX_NOSUBTYPES    0x1000UL /* don't use index w/ subtypes */
 #define SLAP_INDEX_NOLANG        0x2000UL /* don't use index w/ lang */
-#define SLAP_INDEX_AUTO_SUBTYPES 0x4000UL /* use mask with lang subtypes */
 
 /*
  * there is a single index for each attribute.  these prefixes ensure
@@ -344,7 +342,7 @@ typedef int slap_mr_filter_func LDAP_P((
 
 typedef struct slap_matching_rule {
        LDAPMatchingRule                smr_mrule;
-       ber_len_t                       smr_oidlen;
+       ber_len_t                               smr_oidlen;
        slap_mask_t                             smr_usage;
 
 #define SLAP_MR_HIDE                   0x8000U
@@ -434,11 +432,11 @@ typedef struct slap_attribute_type {
 
        struct slap_attribute_type      *sat_next;
 
-#define sat_oid                        sat_atype.at_oid
-#define sat_names              sat_atype.at_names
-#define sat_desc               sat_atype.at_desc
+#define sat_oid                                sat_atype.at_oid
+#define sat_names                      sat_atype.at_names
+#define sat_desc                       sat_atype.at_desc
 #define sat_obsolete           sat_atype.at_obsolete
-#define sat_sup_oid            sat_atype.at_sup_oid
+#define sat_sup_oid                    sat_atype.at_sup_oid
 #define sat_equality_oid       sat_atype.at_equality_oid
 #define sat_ordering_oid       sat_atype.at_ordering_oid
 #define sat_substr_oid         sat_atype.at_substr_oid
@@ -446,7 +444,7 @@ typedef struct slap_attribute_type {
 #define sat_single_value       sat_atype.at_single_value
 #define sat_collective         sat_atype.at_collective
 #define sat_no_user_mod                sat_atype.at_no_user_mod
-#define sat_usage              sat_atype.at_usage
+#define sat_usage                      sat_atype.at_usage
 #define sat_extensions         sat_atype.at_extensions
 
        struct slap_attr_desc           *sat_ad;
@@ -473,8 +471,8 @@ typedef struct slap_object_class {
        struct slap_object_class        **soc_sups;
        AttributeType                           **soc_required;
        AttributeType                           **soc_allowed;
-       ObjectClassSchemaCheckFN        *sco_check;
-       slap_mask_t                                     sco_flags;
+       ObjectClassSchemaCheckFN        *soc_check;
+       slap_mask_t                                     soc_flags;
 #define soc_oid                                soc_oclass.oc_oid
 #define soc_names                      soc_oclass.oc_names
 #define soc_desc                       soc_oclass.oc_desc
@@ -488,6 +486,14 @@ typedef struct slap_object_class {
        struct slap_object_class        *soc_next;
 } ObjectClass;
 
+#define        SLAP_OC_ALIAS           0x01
+#define        SLAP_OC_REFERRAL        0x02
+#define        SLAP_OC_SUBENTRY        0x04
+#define        SLAP_OC_DYNAMICOBJECT   0x08
+#define        SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY     0x10
+#define        SLAP_OC__MASK           0x1F
+#define        SLAP_OC__END            0x20
+
 #ifdef LDAP_EXTENDED_SCHEMA
 /*
  * DIT content rule
@@ -545,7 +551,7 @@ struct slap_internal_schema {
        ObjectClass *si_oc_subentry;
        ObjectClass *si_oc_subschema;
        ObjectClass *si_oc_monitor;
-       ObjectClass *si_oc_collectiveAttributes;
+       ObjectClass *si_oc_collectiveAttributeSubentry;
        ObjectClass *si_oc_dynamicObject;
 
        /* objectClass attribute descriptions */
@@ -559,7 +565,7 @@ struct slap_internal_schema {
        AttributeDescription *si_ad_modifyTimestamp;
        AttributeDescription *si_ad_hasSubordinates;
        AttributeDescription *si_ad_subschemaSubentry;
-       AttributeDescription *si_ad_collectiveSubentry;
+       AttributeDescription *si_ad_collectiveSubentries;
        AttributeDescription *si_ad_collectiveExclusions;
        AttributeDescription *si_ad_entryUUID;
        AttributeDescription *si_ad_entryCSN;
@@ -748,6 +754,10 @@ typedef struct slap_entry {
 
        Attribute       *e_attrs;       /* list of attributes + values */
 
+       slap_mask_t     e_ocflags;
+
+       struct berval   e_bv;           /* For entry_encode/entry_decode */
+
        /* for use by the backend for any purpose */
        void*   e_private;
 } Entry;
@@ -1358,9 +1368,6 @@ struct slap_backend_info {
 #define o_tls_ssf              o_authz.sai_tls_ssf
 #define o_sasl_ssf             o_authz.sai_sasl_ssf
 
-struct slap_op;
-struct slap_conn;
-
 typedef void (slap_response)( struct slap_conn *, struct slap_op *,
        ber_tag_t, ber_int_t, ber_int_t, const char *, const char *,
        BerVarray, const char *, struct berval *,
@@ -1525,11 +1532,6 @@ typedef struct sasl_regexp {
   int offset[SASLREGEX_REPLACE+2];        /* offsets of $1,$2... in *replace */
 } SaslRegexp_t;
 
-/* Flags for telling slap_sasl_getdn() what type of identity is being passed */
-#define FLAG_GETDN_FINAL   1
-#define FLAG_GETDN_AUTHCID 2
-#define FLAG_GETDN_AUTHZID 4
-
 /*
  * listener; need to access it from monitor backend
  */