X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=06decced857bd7a70f6174bbb57542bb35393f80;hb=3d9377f76404965d483c210a95e4e55386ff98a3;hp=fd07e57a23a695fa6625d7c76d13daf16d20b451;hpb=19f2925ab1fc08b11d003b831f158d28e7fbb284;p=openldap diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index fd07e57a23..06decced85 100644 --- 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 */ @@ -138,8 +137,6 @@ LDAP_BEGIN_DECL #define SLAPD_ROLE_CLASS "organizationalRole" #define SLAPD_ACI_SYNTAX "1.3.6.1.4.1.4203.666.2.1" -#define SLAPD_ACI_ATTR "OpenLDAPaci" - #define SLAPD_OCTETSTRING_SYNTAX "1.3.6.1.4.1.1466.115.121.1.40" /* change this to "OpenLDAPset" */ @@ -198,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 @@ -331,8 +327,8 @@ typedef int slap_mr_indexer_func LDAP_P(( struct slap_syntax *syntax, /* syntax of stored value */ struct slap_matching_rule *mr, struct berval *prefix, - BVarray values, - BVarray *keys )); + BerVarray values, + BerVarray *keys )); /* Filter index function */ typedef int slap_mr_filter_func LDAP_P(( @@ -342,11 +338,11 @@ typedef int slap_mr_filter_func LDAP_P(( struct slap_matching_rule *mr, struct berval *prefix, void * assertValue, - BVarray *keys )); + BerVarray *keys )); 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 @@ -429,16 +425,18 @@ typedef struct slap_attribute_type { MatchingRule *sat_approx; MatchingRule *sat_ordering; MatchingRule *sat_substr; - Syntax *sat_syntax; + Syntax *sat_syntax; + AttributeTypeSchemaCheckFN *sat_check; - struct slap_attr_desc *sat_ad; + slap_mask_t sat_flags; + struct slap_attribute_type *sat_next; - ldap_pvt_thread_mutex_t sat_ad_mutex; -#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,8 +444,11 @@ 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; + ldap_pvt_thread_mutex_t sat_ad_mutex; } AttributeType; #define is_at_operational(at) ((at)->sat_usage) @@ -468,21 +469,44 @@ typedef int (ObjectClassSchemaCheckFN)( typedef struct slap_object_class { LDAPObjectClass soc_oclass; struct slap_object_class **soc_sups; - AttributeType **soc_required; - AttributeType **soc_allowed; + AttributeType **soc_required; + AttributeType **soc_allowed; ObjectClassSchemaCheckFN *sco_check; - struct slap_object_class *soc_next; -#define soc_oid soc_oclass.oc_oid -#define soc_names soc_oclass.oc_names -#define soc_desc soc_oclass.oc_desc + slap_mask_t sco_flags; +#define soc_oid soc_oclass.oc_oid +#define soc_names soc_oclass.oc_names +#define soc_desc soc_oclass.oc_desc #define soc_obsolete soc_oclass.oc_obsolete #define soc_sup_oids soc_oclass.oc_sup_oids -#define soc_kind soc_oclass.oc_kind +#define soc_kind soc_oclass.oc_kind #define soc_at_oids_must soc_oclass.oc_at_oids_must #define soc_at_oids_may soc_oclass.oc_at_oids_may #define soc_extensions soc_oclass.oc_extensions + + struct slap_object_class *soc_next; } ObjectClass; +#ifdef LDAP_EXTENDED_SCHEMA +/* + * DIT content rule + */ +typedef struct slap_content_rule { + LDAPContentRule scr_crule; + ObjectClass *scr_sclass; + ObjectClass **scr_auxiliaries; /* optional */ + AttributeType **scr_required; /* optional */ + AttributeType **scr_allowed; /* optional */ + AttributeType **scr_precluded; /* optional */ +#define scr_oid scr_crule.cr_oid +#define scr_names scr_crule.cr_names +#define scr_desc scr_crule.cr_desc +#define scr_obsolete soc_oclass.cr_obsolete +#define scr_cr_oids_aux soc_oclass.cr_oc_oids_aux +#define scr_cr_oids_must soc_oclass.cr_at_oids_must +#define scr_cr_oids_may soc_oclass.cr_at_oids_may +#define scr_cr_oids_not soc_oclass.cr_at_oids_not +} ContentRule; +#endif /* * represents a recognized attribute description ( type + options ) @@ -518,6 +542,7 @@ struct slap_internal_schema { ObjectClass *si_oc_rootdse; ObjectClass *si_oc_subentry; ObjectClass *si_oc_subschema; + ObjectClass *si_oc_monitor; ObjectClass *si_oc_collectiveAttributes; ObjectClass *si_oc_dynamicObject; @@ -687,8 +712,11 @@ typedef struct slap_filter { */ typedef struct slap_attr { AttributeDescription *a_desc; - BVarray a_vals; + BerVarray a_vals; struct slap_attr *a_next; + unsigned a_flags; +#define SLAP_ATTR_IXADD 0x1U +#define SLAP_ATTR_IXDEL 0x2U } Attribute; @@ -729,7 +757,7 @@ typedef struct slap_mod { int sm_op; AttributeDescription *sm_desc; struct berval sm_type; - BVarray sm_bvalues; + BerVarray sm_bvalues; } Modification; typedef struct slap_mod_list { @@ -1092,7 +1120,7 @@ struct slap_backend_db { struct slap_replica_info **be_replica; /* replicas of this backend (in master) */ char *be_replogfile; /* replication log file (in master) */ struct berval be_update_ndn; /* allowed to make changes (in replicas) */ - BVarray be_update_refs; /* where to refer modifying clients to */ + BerVarray be_update_refs; /* where to refer modifying clients to */ char *be_realm; void *be_private; /* anything the backend database needs */ @@ -1165,7 +1193,7 @@ typedef int (BI_op_extended) LDAP_P(( struct berval ** rspdata, LDAPControl *** rspctrls, const char ** text, - BVarray *refs )); + BerVarray *refs )); typedef int (BI_entry_release_rw) LDAP_P((BackendDB *bd, struct slap_conn *c, struct slap_op *o, @@ -1188,7 +1216,7 @@ typedef int (BI_acl_attribute) LDAP_P((Backend *bd, struct slap_conn *c, struct slap_op *o, Entry *e, struct berval *edn, AttributeDescription *entry_at, - BVarray *vals )); + BerVarray *vals )); typedef int (BI_operational) LDAP_P((Backend *bd, struct slap_conn *c, struct slap_op *o, @@ -1204,7 +1232,8 @@ typedef int (BI_tool_entry_close) LDAP_P(( BackendDB *be )); typedef ID (BI_tool_entry_first) LDAP_P(( BackendDB *be )); typedef ID (BI_tool_entry_next) LDAP_P(( BackendDB *be )); typedef Entry* (BI_tool_entry_get) LDAP_P(( BackendDB *be, ID id )); -typedef ID (BI_tool_entry_put) LDAP_P(( BackendDB *be, Entry *e )); +typedef ID (BI_tool_entry_put) LDAP_P(( BackendDB *be, Entry *e, + struct berval *text )); typedef int (BI_tool_entry_reindex) LDAP_P(( BackendDB *be, ID id )); typedef int (BI_tool_sync) LDAP_P(( BackendDB *be )); @@ -1327,59 +1356,59 @@ 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 *, - BVarray, const char *, struct berval *, + BerVarray, const char *, struct berval *, struct berval *, LDAPControl ** ); typedef void (slap_sresult)( struct slap_conn *, struct slap_op *, - ber_int_t, const char *, const char *, BVarray, + ber_int_t, const char *, const char *, BerVarray, LDAPControl **, int nentries); +typedef int (slap_sendentry)( BackendDB *, struct slap_conn *, + struct slap_op *, Entry *, AttributeName *, int, LDAPControl **); + +typedef struct slap_callback { + slap_response *sc_response; + slap_sresult *sc_sresult; + slap_sendentry *sc_sendentry; + void *sc_private; +} slap_callback; + /* * represents an operation pending from an ldap client */ typedef struct slap_op { ber_int_t o_opid; /* id of this operation */ ber_int_t o_msgid; /* msgid of the request */ -#ifdef LDAP_CONNECTIONLESS - Sockaddr o_peeraddr; /* UDP peer address */ -#endif - - ldap_pvt_thread_t o_tid; /* thread handling this op */ - - BerElement *o_ber; /* ber of the request */ - + ber_int_t o_protocol; /* version of the LDAP protocol used by client */ ber_tag_t o_tag; /* tag of the request */ time_t o_time; /* time op was initiated */ - - AuthorizationInformation o_authz; - - ber_int_t o_protocol; /* version of the LDAP protocol used by client */ - - LDAPControl **o_ctrls; /* controls */ - unsigned long o_connid; /* id of conn initiating this op */ - - ldap_pvt_thread_mutex_t o_abandonmutex; /* protects o_abandon */ - int o_abandon; /* abandon flag */ - slap_response *o_response; /* callback function */ - slap_sresult *o_sresult; /* search result callback */ - - LDAP_STAILQ_ENTRY(slap_op) o_next; /* next operation in list */ - void *o_private; /* anything the backend needs */ - void *o_glue; /* for the glue backend */ + ldap_pvt_thread_t o_tid; /* thread handling this op */ #define SLAP_NO_CONTROL 0 #define SLAP_NONCRITICAL_CONTROL 1 #define SLAP_CRITICAL_CONTROL 2 - char o_managedsait; char o_subentries; char o_subentries_visibility; + + int o_abandon; /* abandon flag */ + ldap_pvt_thread_mutex_t o_abandonmutex; /* protects o_abandon */ + +#ifdef LDAP_CONNECTIONLESS + Sockaddr o_peeraddr; /* UDP peer address */ +#endif + AuthorizationInformation o_authz; + + BerElement *o_ber; /* ber of the request */ + slap_callback *o_callback; /* callback pointers */ + LDAPControl **o_ctrls; /* controls */ + + void *o_private; /* anything the backend needs */ + + LDAP_STAILQ_ENTRY(slap_op) o_next; /* next operation in list */ } Operation; #define get_manageDSAit(op) ((int)(op)->o_managedsait) @@ -1491,11 +1520,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 */ @@ -1508,7 +1532,7 @@ typedef struct slap_listener { #ifdef LDAP_CONNECTIONLESS int sl_is_udp; /* UDP listener is also data port */ #endif - ber_socket_t sl_sd; + ber_socket_t sl_sd; Sockaddr sl_sa; #define sl_addr sl_sa.sa_in_addr } Listener;