X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=29755901fea50c993e6d9202bf872225615442a9;hb=af866c3b44ba37577671f2bffd482499f4b8bc00;hp=574c1b684092184a1fe0d4d69dc9417aaf142804;hpb=ffbb5d4ed2ba5d4cf75b6c1c971bdea51ba77d60;p=openldap diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 574c1b6840..29755901fe 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 1998-2004 The OpenLDAP Foundation. + * Copyright 1998-2005 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -29,10 +29,6 @@ #include "ldap_defaults.h" -#ifdef HAVE_GMP -#include -#endif /* HAVE_GMP */ - #include #include @@ -56,11 +52,31 @@ #include #include "lber_pvt.h" +#include "ldap_pvt.h" #include "ldap_pvt_thread.h" #include "ldap_queue.h" LDAP_BEGIN_DECL + +#ifdef LDAP_DEVEL +#define SLAP_ACL_HONOR_DISCLOSE /* partially implemented */ +#define SLAP_ACL_HONOR_MANAGE /* not yet implemented */ +#define SLAP_DYNACL +#define LDAP_COMP_MATCH +#define LDAP_DYNAMIC_OBJECTS +#define LDAP_SYNC_TIMESTAMP +#define LDAP_COLLECTIVE_ATTRIBUTES +#define SLAP_CONTROL_X_TREE_DELETE LDAP_CONTROL_X_TREE_DELETE + +#define SLAP_USE_CONFDIR /* partially implemented */ + +#ifdef ENABLE_REWRITE +#define SLAP_AUTH_REWRITE 1 /* use librewrite for sasl-regexp */ +#endif +#endif + + /* * SLAPD Memory allocation macros * @@ -97,8 +113,6 @@ LDAP_BEGIN_DECL #define SLAP_MAX_WORKER_THREADS (16) -#define SLAP_MAX_SYNCREPL_THREADS (8) - #define SLAP_SB_MAX_INCOMING_DEFAULT ((1<<18) - 1) #define SLAP_SB_MAX_INCOMING_AUTH ((1<<24) - 1) @@ -233,21 +247,13 @@ typedef struct slap_ssf_set { | SLAP_INDEX_SUBSTR_ANY \ | SLAP_INDEX_SUBSTR_FINAL ) -/* constants for initial/final substrings indices */ -#ifndef SLAP_INDEX_SUBSTR_IF_MINLEN -# define SLAP_INDEX_SUBSTR_IF_MINLEN 2 -#endif -#ifndef SLAP_INDEX_SUBSTR_IF_MAXLEN -# define SLAP_INDEX_SUBSTR_IF_MAXLEN 4 -#endif +/* defaults for initial/final substring indices */ +#define SLAP_INDEX_SUBSTR_IF_MINLEN_DEFAULT 2 +#define SLAP_INDEX_SUBSTR_IF_MAXLEN_DEFAULT 4 -/* constants for any substrings indices */ -#ifndef SLAP_INDEX_SUBSTR_ANY_LEN -# define SLAP_INDEX_SUBSTR_ANY_LEN 4 -#endif -#ifndef SLAP_INDEX_SUBSTR_ANY_STEP -# define SLAP_INDEX_SUBSTR_ANY_STEP 2 -#endif +/* defaults for any substring indices */ +#define SLAP_INDEX_SUBSTR_ANY_LEN_DEFAULT 4 +#define SLAP_INDEX_SUBSTR_ANY_STEP_DEFAULT 2 #define SLAP_INDEX_FLAGS 0xF000UL #define SLAP_INDEX_NOSUBTYPES 0x1000UL /* don't use index w/ subtypes */ @@ -317,8 +323,11 @@ extern int slap_inet4or6; typedef struct slap_oid_macro { struct berval som_oid; - char **som_names; - LDAP_SLIST_ENTRY(slap_oid_macro) som_next; + BerVarray som_names; + BerVarray som_subs; +#define SLAP_OM_HARDCODE 0x10000U /* This is hardcoded schema */ + int som_flags; + LDAP_STAILQ_ENTRY(slap_oid_macro) som_next; } OidMacro; /* forward declarations */ @@ -335,10 +344,6 @@ typedef int slap_syntax_transform_func LDAP_P(( struct berval * out, void *memctx)); -#ifdef LDAP_DEVEL -#define LDAP_COMP_MATCH -#endif - #ifdef LDAP_COMP_MATCH typedef void* slap_component_transform_func LDAP_P(( struct berval * in )); @@ -383,7 +388,7 @@ typedef struct slap_syntax { #endif #ifdef LDAP_COMP_MATCH slap_component_transform_func *ssyn_attr2comp; - struct ComponentDesc* comp_syntax; + struct ComponentDesc* ssync_comp_syntax; #endif LDAP_SLIST_ENTRY(slap_syntax) ssyn_next; @@ -487,8 +492,9 @@ typedef struct slap_matching_rule { #define SLAP_MR_ORDERING 0x0200U #define SLAP_MR_SUBSTR 0x0400U #define SLAP_MR_EXT 0x0800U /* implicitly extensible */ +#define SLAP_MR_ORDERED_INDEX 0x1000U #ifdef LDAP_COMP_MATCH -#define SLAP_MR_COMPONENT 0x1000U +#define SLAP_MR_COMPONENT 0x2000U #endif #define SLAP_MR_EQUALITY_APPROX ( SLAP_MR_EQUALITY | 0x0010U ) @@ -646,9 +652,12 @@ typedef struct slap_attribute_type { #endif #define SLAP_AT_DYNAMIC 0x0400U /* dynamically generated */ +#define SLAP_AT_ORDERED 0x0001U /* values are ordered */ +#define SLAP_AT_HARDCODE 0x10000U /* This is hardcoded schema */ + slap_mask_t sat_flags; - LDAP_SLIST_ENTRY(slap_attribute_type) sat_next; + LDAP_STAILQ_ENTRY(slap_attribute_type) sat_next; #define sat_oid sat_atype.at_oid #define sat_names sat_atype.at_names @@ -702,7 +711,7 @@ typedef struct slap_object_class { #define soc_at_oids_may soc_oclass.oc_at_oids_may #define soc_extensions soc_oclass.oc_extensions - LDAP_SLIST_ENTRY(slap_object_class) soc_next; + LDAP_STAILQ_ENTRY(slap_object_class) soc_next; } ObjectClass; #define SLAP_OC_ALIAS 0x0001 @@ -721,6 +730,7 @@ typedef struct slap_object_class { #else #define SLAP_OC_HIDE 0x8000 #endif +#define SLAP_OC_HARDCODE 0x10000U /* This is hardcoded schema */ /* * DIT content rule @@ -741,7 +751,10 @@ typedef struct slap_content_rule { #define scr_at_oids_may scr_crule.cr_at_oids_may #define scr_at_oids_not scr_crule.cr_at_oids_not - LDAP_SLIST_ENTRY( slap_content_rule ) scr_next; +#define SLAP_CR_HARDCODE 0x10000U + int scr_flags; + + LDAP_STAILQ_ENTRY( slap_content_rule ) scr_next; } ContentRule; /* Represents a recognized attribute description ( type + options ). */ @@ -822,6 +835,7 @@ struct slap_internal_schema { AttributeDescription *si_ad_monitorContext; AttributeDescription *si_ad_vendorName; AttributeDescription *si_ad_vendorVersion; + AttributeDescription *si_ad_configContext; /* subentry attribute descriptions */ AttributeDescription *si_ad_administrativeRole; @@ -858,6 +872,7 @@ struct slap_internal_schema { AttributeDescription *si_ad_distinguishedName; AttributeDescription *si_ad_name; AttributeDescription *si_ad_cn; + AttributeDescription *si_ad_uid; AttributeDescription *si_ad_userPassword; AttributeDescription *si_ad_labeledURI; #ifdef SLAPD_AUTHPASSWD @@ -903,6 +918,9 @@ struct slap_internal_schema { typedef struct slap_attr_assertion { AttributeDescription *aa_desc; struct berval aa_value; +#ifdef LDAP_COMP_MATCH + struct slap_component_filter *aa_cf;/* for attribute aliasing */ +#endif } AttributeAssertion; typedef struct slap_ss_assertion { @@ -923,7 +941,7 @@ typedef struct slap_mr_assertion { int ma_dnattrs; /* boolean */ struct berval ma_value; /* required */ #ifdef LDAP_COMP_MATCH - struct slap_component_filter* cf; + struct slap_component_filter* ma_cf; /* component filter */ #endif } MatchingRuleAssertion; @@ -1038,6 +1056,14 @@ typedef struct slap_valuesreturnfilter { struct slap_valuesreturnfilter *vrf_next; } ValuesReturnFilter; +#ifdef LDAP_COMP_MATCH +struct slap_component_syntax_info; +typedef struct slap_component_data { + void* cd_mem_op;/* nibble memory handler */ + struct slap_component_syntax_info** cd_tree;/* component tree */ +} ComponentData; +#endif + /* * represents an attribute (description + values) */ @@ -1045,13 +1071,13 @@ typedef struct slap_attr { AttributeDescription *a_desc; BerVarray a_vals; /* preserved values */ BerVarray a_nvals; /* normalized values */ +#ifdef LDAP_COMP_MATCH + ComponentData *a_comp_data; /* component values */ +#endif struct slap_attr *a_next; unsigned a_flags; #define SLAP_ATTR_IXADD 0x1U #define SLAP_ATTR_IXDEL 0x2U -#ifdef LDAP_COMP_MATCH - void* component_values; -#endif } Attribute; @@ -1124,11 +1150,13 @@ typedef struct slap_ldap_modlist { typedef enum slap_access_e { ACL_INVALID_ACCESS = -1, ACL_NONE = 0, + ACL_DISCLOSE, ACL_AUTH, ACL_COMPARE, ACL_SEARCH, ACL_READ, - ACL_WRITE + ACL_WRITE, + ACL_MANAGE } slap_access_t; typedef enum slap_control_e { @@ -1145,7 +1173,11 @@ typedef enum slap_style_e { ACL_STYLE_ONE, ACL_STYLE_SUBTREE, ACL_STYLE_CHILDREN, + ACL_STYLE_LEVEL, ACL_STYLE_ATTROF, + ACL_STYLE_ANONYMOUS, + ACL_STYLE_USERS, + ACL_STYLE_SELF, ACL_STYLE_IP, ACL_STYLE_PATH } slap_style_t; @@ -1163,6 +1195,39 @@ typedef struct slap_authz_info { slap_ssf_t sai_sasl_ssf; /* SASL SSF */ } AuthorizationInformation; + +#ifdef SLAP_DYNACL +struct slap_op; + +/* + * "dynamic" ACL infrastructure (for ACIs and more) + */ +typedef int (slap_dynacl_parse)( const char *fname, int lineno, slap_style_t, const char *, void **privp ); +typedef int (slap_dynacl_unparse)( void *priv, struct berval *bv ); +typedef int (slap_dynacl_mask)( + void *priv, + struct slap_op *op, + Entry *e, + AttributeDescription *desc, + struct berval *val, + int nmatch, + regmatch_t *matches, + slap_access_t *grant, + slap_access_t *deny ); +typedef int (slap_dynacl_destroy)( void *priv ); + +typedef struct slap_dynacl_t { + char *da_name; + slap_dynacl_parse *da_parse; + slap_dynacl_unparse *da_unparse; + slap_dynacl_mask *da_mask; + slap_dynacl_destroy *da_destroy; + + void *da_private; + struct slap_dynacl_t *da_next; +} slap_dynacl_t; +#endif /* SLAP_DYNACL */ + /* the "by" part */ typedef struct slap_access { slap_control_t a_type; @@ -1170,11 +1235,13 @@ typedef struct slap_access { #define ACL_ACCESS2PRIV(access) (0x01U << (access)) #define ACL_PRIV_NONE ACL_ACCESS2PRIV( ACL_NONE ) +#define ACL_PRIV_DISCLOSE ACL_ACCESS2PRIV( ACL_DISCLOSE ) #define ACL_PRIV_AUTH ACL_ACCESS2PRIV( ACL_AUTH ) #define ACL_PRIV_COMPARE ACL_ACCESS2PRIV( ACL_COMPARE ) #define ACL_PRIV_SEARCH ACL_ACCESS2PRIV( ACL_SEARCH ) #define ACL_PRIV_READ ACL_ACCESS2PRIV( ACL_READ ) #define ACL_PRIV_WRITE ACL_ACCESS2PRIV( ACL_WRITE ) +#define ACL_PRIV_MANAGE ACL_ACCESS2PRIV( ACL_MANAGE ) #define ACL_PRIV_MASK 0x00ffUL @@ -1203,26 +1270,32 @@ typedef struct slap_access { #define ACL_IS_SUBTRACTIVE(m) ACL_PRIV_ISSET((m),ACL_PRIV_SUBSTRACTIVE) #define ACL_LVL_NONE (ACL_PRIV_NONE|ACL_PRIV_LEVEL) -#define ACL_LVL_AUTH (ACL_PRIV_AUTH|ACL_LVL_NONE) +#define ACL_LVL_DISCLOSE (ACL_PRIV_DISCLOSE|ACL_LVL_NONE) +#define ACL_LVL_AUTH (ACL_PRIV_AUTH|ACL_LVL_DISCLOSE) #define ACL_LVL_COMPARE (ACL_PRIV_COMPARE|ACL_LVL_AUTH) #define ACL_LVL_SEARCH (ACL_PRIV_SEARCH|ACL_LVL_COMPARE) #define ACL_LVL_READ (ACL_PRIV_READ|ACL_LVL_SEARCH) #define ACL_LVL_WRITE (ACL_PRIV_WRITE|ACL_LVL_READ) +#define ACL_LVL_MANAGE (ACL_PRIV_MANAGE|ACL_LVL_WRITE) #define ACL_LVL(m,l) (((m)&ACL_PRIV_MASK) == ((l)&ACL_PRIV_MASK)) #define ACL_LVL_IS_NONE(m) ACL_LVL((m),ACL_LVL_NONE) +#define ACL_LVL_IS_DISCLOSE(m) ACL_LVL((m),ACL_LVL_DISCLOSE) #define ACL_LVL_IS_AUTH(m) ACL_LVL((m),ACL_LVL_AUTH) #define ACL_LVL_IS_COMPARE(m) ACL_LVL((m),ACL_LVL_COMPARE) #define ACL_LVL_IS_SEARCH(m) ACL_LVL((m),ACL_LVL_SEARCH) #define ACL_LVL_IS_READ(m) ACL_LVL((m),ACL_LVL_READ) #define ACL_LVL_IS_WRITE(m) ACL_LVL((m),ACL_LVL_WRITE) +#define ACL_LVL_IS_MANAGE(m) ACL_LVL((m),ACL_LVL_MANAGE) #define ACL_LVL_ASSIGN_NONE(m) ACL_PRIV_ASSIGN((m),ACL_LVL_NONE) +#define ACL_LVL_ASSIGN_DISCLOSE(m) ACL_PRIV_ASSIGN((m),ACL_LVL_DISCLOSE) #define ACL_LVL_ASSIGN_AUTH(m) ACL_PRIV_ASSIGN((m),ACL_LVL_AUTH) #define ACL_LVL_ASSIGN_COMPARE(m) ACL_PRIV_ASSIGN((m),ACL_LVL_COMPARE) #define ACL_LVL_ASSIGN_SEARCH(m) ACL_PRIV_ASSIGN((m),ACL_LVL_SEARCH) #define ACL_LVL_ASSIGN_READ(m) ACL_PRIV_ASSIGN((m),ACL_LVL_READ) #define ACL_LVL_ASSIGN_WRITE(m) ACL_PRIV_ASSIGN((m),ACL_LVL_WRITE) +#define ACL_LVL_ASSIGN_MANAGE(m) ACL_PRIV_ASSIGN((m),ACL_LVL_MANAGE) slap_mask_t a_access_mask; @@ -1230,6 +1303,8 @@ typedef struct slap_access { #define a_dn_pat a_authz.sai_dn slap_style_t a_dn_style; + int a_dn_level; + int a_dn_self_level; AttributeDescription *a_dn_at; int a_dn_self; int a_dn_expand; @@ -1252,9 +1327,13 @@ typedef struct slap_access { slap_style_t a_set_style; struct berval a_set_pat; +#ifdef SLAP_DYNACL + slap_dynacl_t *a_dynacl; +#else /* ! SLAP_DYNACL */ #ifdef SLAPD_ACI_ENABLED AttributeDescription *a_aci_at; #endif +#endif /* SLAP_DYNACL */ /* ACL Groups */ slap_style_t a_group_style; @@ -1313,11 +1392,13 @@ typedef struct slap_acl_state { typedef struct slap_backend_info BackendInfo; /* per backend type */ typedef struct slap_backend_db BackendDB; /* per backend database */ +typedef LDAP_STAILQ_HEAD(BeI, slap_backend_info) slap_bi_head; +typedef LDAP_STAILQ_HEAD(BeDB, slap_backend_db) slap_be_head; LDAP_SLAPD_V (int) nBackendInfo; LDAP_SLAPD_V (int) nBackendDB; -LDAP_SLAPD_V (BackendInfo *) backendInfo; -LDAP_SLAPD_V (BackendDB *) backendDB; +LDAP_SLAPD_V (slap_bi_head) backendInfo; +LDAP_SLAPD_V (slap_be_head) backendDB; LDAP_SLAPD_V (BackendDB *) frontendDB; LDAP_SLAPD_V (int) slapMode; @@ -1329,14 +1410,41 @@ LDAP_SLAPD_V (int) slapMode; #define SLAP_TRUNCATE_MODE 0x0100 #define SLAP_TOOL_READMAIN 0x0200 #define SLAP_TOOL_READONLY 0x0400 +#define SLAP_TOOL_QUICK 0x0800 + +#define SB_TLS_OFF 0 +#define SB_TLS_ON 1 +#define SB_TLS_CRITICAL 2 + +typedef struct slap_bindconf { + int sb_tls; + int sb_method; + char *sb_binddn; + char *sb_cred; + char *sb_saslmech; + char *sb_secprops; + char *sb_realm; + char *sb_authcId; + char *sb_authzId; +} slap_bindconf; struct slap_replica_info { - char *ri_host; /* supersedes be_replica */ - BerVarray ri_nsuffix; /* array of suffixes this replica accepts */ + const char *ri_uri; /* supersedes be_replica */ + const char *ri_host; /* points to host part of uri */ + BerVarray ri_nsuffix; /* array of suffixes this replica accepts */ AttributeName *ri_attrs; /* attrs to replicate, NULL=all */ - int ri_exclude; /* 1 => exclude ri_attrs */ + int ri_exclude; /* 1 => exclude ri_attrs */ + slap_bindconf ri_bindconf; /* for back-config */ }; +typedef struct slap_verbmasks { + struct berval word; + const int mask; +} slap_verbmasks; + +#define SLAP_LIMIT_TIME 1 +#define SLAP_LIMIT_SIZE 2 + struct slap_limits_set { /* time limits */ int lms_t_soft; @@ -1400,10 +1508,11 @@ typedef BackendDB Backend; * syncinfo structure for syncrepl */ -#define SLAP_SYNC_SID_SIZE 3 #define SLAP_SYNC_RID_SIZE 3 #define SLAP_SYNCUUID_SET_SIZE 256 +#define SLAP_SYNC_UPDATE_MSGID 2 + struct nonpresent_entry { struct berval *npe_name; struct berval *npe_nname; @@ -1411,9 +1520,8 @@ struct nonpresent_entry { }; struct sync_cookie { - struct berval *ctxcsn; - long sid; - struct berval *octet_str; + struct berval ctxcsn; + struct berval octet_str; long rid; LDAP_STAILQ_ENTRY(sync_cookie) sc_next; }; @@ -1423,29 +1531,20 @@ LDAP_STAILQ_HEAD( slap_sync_cookie_s, sync_cookie ); typedef struct syncinfo_s { struct slap_backend_db *si_be; long si_rid; - char *si_provideruri; - BerVarray si_provideruri_bv; -#define SYNCINFO_TLS_OFF 0 -#define SYNCINFO_TLS_ON 1 -#define SYNCINFO_TLS_CRITICAL 2 - int si_tls; - struct berval si_updatedn; - int si_bindmethod; - char *si_binddn; - char *si_passwd; - char *si_saslmech; - char *si_secprops; - char *si_realm; - char *si_authcId; - char *si_authzId; - int si_schemachecking; + struct berval si_provideruri; + slap_bindconf si_bindconf; struct berval si_filterstr; struct berval si_base; int si_scope; int si_attrsonly; - char **si_attrs; - ObjectClass **si_ocs; + char *si_anfile; + AttributeName *si_anlist; + AttributeName *si_exanlist; + char **si_attrs; char **si_exattrs; + int si_allattrs; + int si_allopattrs; + int si_schemachecking; int si_type; time_t si_interval; time_t *si_retryinterval; @@ -1455,15 +1554,20 @@ typedef struct syncinfo_s { int si_manageDSAit; int si_slimit; int si_tlimit; - struct berval si_syncUUID_ndn; + int si_refreshDelete; + int si_refreshPresent; Avlnode *si_presentlist; LDAP *si_ld; LDAP_LIST_HEAD(np, nonpresent_entry) si_nonpresentlist; - LDAP_STAILQ_ENTRY( syncinfo_s ) si_next; + ldap_pvt_thread_mutex_t si_mutex; } syncinfo_t; LDAP_TAILQ_HEAD( be_pcl, slap_csn_entry ); +#ifndef SLAP_MAX_CIDS +#define SLAP_MAX_CIDS 32 /* Maximum number of supported controls */ +#endif + struct slap_backend_db { BackendInfo *bd_info; /* pointer to shared backend info */ @@ -1488,6 +1592,7 @@ struct slap_backend_db { #define be_extended bd_info->bi_extended #define be_chk_referrals bd_info->bi_chk_referrals +#define be_chk_controls bd_info->bi_chk_controls #define be_fetch bd_info->bi_entry_get_rw #define be_release bd_info->bi_entry_release_rw #define be_group bd_info->bi_acl_group @@ -1501,8 +1606,6 @@ struct slap_backend_db { */ #define be_has_subordinates bd_info->bi_has_subordinates -#define be_controls bd_info->bi_controls - #define be_connection_init bd_info->bi_connection_init #define be_connection_destroy bd_info->bi_connection_destroy @@ -1520,12 +1623,20 @@ struct slap_backend_db { #define be_entry_modify bd_info->bi_tool_entry_modify #endif + /* supported controls */ + /* note: set to 0 if the database does not support the control; + * be_ctrls[SLAP_MAX_CIDS] is set to 1 if initialized */ + char be_ctrls[SLAP_MAX_CIDS + 1]; + /* Database flags */ #define SLAP_DBFLAG_NOLASTMOD 0x0001U #define SLAP_DBFLAG_NO_SCHEMA_CHECK 0x0002U #define SLAP_DBFLAG_GLUE_INSTANCE 0x0010U /* a glue backend */ #define SLAP_DBFLAG_GLUE_SUBORDINATE 0x0020U /* child of a glue hierarchy */ #define SLAP_DBFLAG_GLUE_LINKED 0x0040U /* child is connected to parent */ +#define SLAP_DBFLAG_GLUE_ADVERTISE 0x0080U /* advertise in rootDSE */ +#define SLAP_DBFLAG_OVERLAY 0x0100U /* this db struct is an overlay */ +#define SLAP_DBFLAG_GLOBAL_OVERLAY 0x0200U /* this db struct is a global overlay */ #define SLAP_DBFLAG_SHADOW 0x8000U /* a shadow */ #define SLAP_DBFLAG_SYNC_SHADOW 0x1000U /* a sync shadow */ #define SLAP_DBFLAG_SLURP_SHADOW 0x2000U /* a slurp shadow */ @@ -1533,6 +1644,7 @@ struct slap_backend_db { #define SLAP_DBFLAGS(be) ((be)->be_flags) #define SLAP_NOLASTMOD(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_NOLASTMOD) #define SLAP_LASTMOD(be) (!SLAP_NOLASTMOD(be)) +#define SLAP_ISOVERLAY(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_OVERLAY) #define SLAP_NO_SCHEMA_CHECK(be) \ (SLAP_DBFLAGS(be) & SLAP_DBFLAG_NO_SCHEMA_CHECK) #define SLAP_GLUE_INSTANCE(be) \ @@ -1541,6 +1653,8 @@ struct slap_backend_db { (SLAP_DBFLAGS(be) & SLAP_DBFLAG_GLUE_SUBORDINATE) #define SLAP_GLUE_LINKED(be) \ (SLAP_DBFLAGS(be) & SLAP_DBFLAG_GLUE_LINKED) +#define SLAP_GLUE_ADVERTISE(be) \ + (SLAP_DBFLAGS(be) & SLAP_DBFLAG_GLUE_ADVERTISE) #define SLAP_SHADOW(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SHADOW) #define SLAP_SYNC_SHADOW(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SYNC_SHADOW) #define SLAP_SLURP_SHADOW(be) (SLAP_DBFLAGS(be) & SLAP_DBFLAG_SLURP_SHADOW) @@ -1621,13 +1735,13 @@ struct slap_backend_db { struct be_pcl *be_pending_csn_list; ldap_pvt_thread_mutex_t be_pcl_mutex; ldap_pvt_thread_mutex_t *be_pcl_mutexp; - struct berval be_context_csn; - LDAP_STAILQ_HEAD( be_si, syncinfo_s ) be_syncinfo; /* For syncrepl */ + syncinfo_t *be_syncinfo; /* For syncrepl */ - char *be_realm; void *be_pb; /* Netscape plugin */ + struct ConfigTable *be_cf_table; void *be_private; /* anything the backend database needs */ + LDAP_STAILQ_ENTRY(slap_backend_db) be_next; }; struct slap_conn; @@ -1697,13 +1811,22 @@ typedef struct req_abandon_s { ber_int_t rs_msgid; } req_abandon_s; +#ifdef LDAP_DEVEL +#define SLAP_EXOP_HIDE 0x0000 +#else +#define SLAP_EXOP_HIDE 0x8000 +#endif +#define SLAP_EXOP_WRITES 0x0001 /* Exop does writes */ + typedef struct req_extended_s { struct berval rs_reqoid; + int rs_flags; struct berval *rs_reqdata; } req_extended_s; typedef struct req_pwdexop_s { struct berval rs_reqoid; + int rs_flags; struct berval rs_old; struct berval rs_new; Modifications *rs_mods; @@ -1794,6 +1917,8 @@ typedef int (BI_op_extended) LDAP_P(( struct slap_op *op, struct slap_rep *rs )); typedef int (BI_chk_referrals) LDAP_P(( struct slap_op *op, struct slap_rep *rs )); +typedef int (BI_chk_controls) LDAP_P(( + struct slap_op *op, struct slap_rep *rs )); typedef int (BI_entry_release_rw) LDAP_P(( struct slap_op *op, Entry *e, int rw )); typedef int (BI_entry_get_rw) LDAP_P(( struct slap_op *op, struct berval *ndn, @@ -1821,6 +1946,8 @@ typedef int (BI_tool_id2entry_get) LDAP_P(( BackendDB *be, ID id, Entry **e )); typedef ID (BI_tool_entry_modify) LDAP_P(( BackendDB *be, Entry *e, struct berval *text )); +struct ConfigTable; /* config.h */ + struct slap_backend_info { char *bi_type; /* type of backend */ @@ -1895,6 +2022,7 @@ struct slap_backend_info { /* Auxilary Functions */ BI_operational *bi_operational; BI_chk_referrals *bi_chk_referrals; + BI_chk_controls *bi_chk_controls; BI_entry_get_rw *bi_entry_get_rw; BI_entry_release_rw *bi_entry_release_rw; @@ -1921,6 +2049,7 @@ struct slap_backend_info { slap_mask_t bi_flags; /* backend flags */ #define SLAP_BFLAG_MONITOR 0x0001U /* a monitor backend */ +#define SLAP_BFLAG_CONFIG 0x0002U /* a config backend */ #define SLAP_BFLAG_NOLASTMODCMD 0x0010U #define SLAP_BFLAG_INCREMENT 0x0100U #define SLAP_BFLAG_ALIASES 0x1000U @@ -1930,6 +2059,7 @@ struct slap_backend_info { #define SLAP_BFLAGS(be) ((be)->bd_info->bi_flags) #define SLAP_MONITOR(be) (SLAP_BFLAGS(be) & SLAP_BFLAG_MONITOR) +#define SLAP_CONFIG(be) (SLAP_BFLAGS(be) & SLAP_BFLAG_CONFIG) #define SLAP_INCREMENT(be) (SLAP_BFLAGS(be) & SLAP_BFLAG_INCREMENT) #define SLAP_ALIASES(be) (SLAP_BFLAGS(be) & SLAP_BFLAG_ALIASES) #define SLAP_REFERRALS(be) (SLAP_BFLAGS(be) & SLAP_BFLAG_REFERRALS) @@ -1938,10 +2068,13 @@ struct slap_backend_info { #define SLAP_NOLASTMODCMD(be) (SLAP_BFLAGS(be) & SLAP_BFLAG_NOLASTMODCMD) #define SLAP_LASTMODCMD(be) (!SLAP_NOLASTMODCMD(be)) - char **bi_controls; /* supported controls */ + char **bi_controls; /* supported controls */ + char bi_ctrls[SLAP_MAX_CIDS + 1]; unsigned int bi_nDB; /* number of databases of this type */ + struct ConfigTable *bi_cf_table; void *bi_private; /* anything the backend type needs */ + LDAP_STAILQ_ENTRY(slap_backend_info) bi_next ; }; #define c_authtype c_authz.sai_method @@ -1996,38 +2129,13 @@ typedef struct slap_overinfo { typedef unsigned long PagedResultsCookie; typedef struct slap_paged_state { Backend *ps_be; + ber_int_t ps_size; PagedResultsCookie ps_cookie; int ps_count; } PagedResultsState; -#define LDAP_PSEARCH_BY_ADD 0x01 -#define LDAP_PSEARCH_BY_DELETE 0x02 -#define LDAP_PSEARCH_BY_PREMODIFY 0x03 -#define LDAP_PSEARCH_BY_MODIFY 0x04 -#define LDAP_PSEARCH_BY_SCOPEOUT 0x05 - -struct psid_entry { - struct slap_op *ps_op; - LDAP_LIST_ENTRY(psid_entry) ps_link; -}; - -struct slog_entry { - struct berval sl_uuid; - struct berval sl_name; - struct berval sl_csn; - LDAP_STAILQ_ENTRY(slog_entry) sl_link; -}; - -/* session lists */ -struct slap_session_entry { - int se_id; - int se_size; - struct berval se_spec; - LDAP_LIST_ENTRY( slap_session_entry ) se_link; -}; - struct slap_csn_entry { - struct berval *ce_csn; + struct berval ce_csn; unsigned long ce_opid; unsigned long ce_connid; #define SLAP_CSN_PENDING 1 @@ -2049,20 +2157,81 @@ typedef struct slap_gacl { char ga_ndn[1]; } GroupAssertion; +struct slap_control_ids { + int sc_assert; + int sc_preRead; + int sc_postRead; + int sc_proxyAuthz; + int sc_manageDSAit; + int sc_modifyIncrement; + int sc_noOp; + int sc_pagedResults; +#ifdef LDAP_DEVEL + int sc_sortedResults; +#endif + int sc_valuesReturnFilter; + int sc_permissiveModify; + int sc_domainScope; + int sc_treeDelete; + int sc_searchOptions; + int sc_subentries; + int sc_LDAPsync; +}; + /* * represents an operation pending from an ldap client */ +typedef struct slap_op_header { + unsigned long oh_opid; /* id of this operation */ + unsigned long oh_connid; /* id of conn initiating this op */ + struct slap_conn *oh_conn; /* connection spawning this op */ + + ber_int_t oh_msgid; /* msgid of the request */ + ber_int_t oh_protocol; /* version of the LDAP protocol used by client */ + + ldap_pvt_thread_t oh_tid; /* thread handling this op */ + + void *oh_threadctx; /* thread pool thread context */ + void *oh_tmpmemctx; /* slab malloc context */ + BerMemoryFunctions *oh_tmpmfuncs; + + char oh_log_prefix[sizeof("conn=18446744073709551615 op=18446744073709551615")]; + +#ifdef LDAP_SLAPI + void *oh_pb; /* NS-SLAPI plugin */ + void *oh_extensions; /* NS-SLAPI plugin */ +#endif +} Opheader; + typedef struct slap_op { - unsigned long o_opid; /* id of this operation */ - unsigned long o_connid; /* id of conn initiating this op */ - struct slap_conn *o_conn; /* connection spawning this op */ - BackendDB *o_bd; /* backend DB processing this op */ + Opheader *o_hdr; + +#define o_opid o_hdr->oh_opid +#define o_connid o_hdr->oh_connid +#define o_conn o_hdr->oh_conn +#define o_msgid o_hdr->oh_msgid +#define o_protocol o_hdr->oh_protocol +#define o_tid o_hdr->oh_tid +#define o_threadctx o_hdr->oh_threadctx +#define o_tmpmemctx o_hdr->oh_tmpmemctx +#define o_tmpmfuncs o_hdr->oh_tmpmfuncs + +#define o_tmpalloc o_tmpmfuncs->bmf_malloc +#define o_tmpcalloc o_tmpmfuncs->bmf_calloc +#define o_tmprealloc o_tmpmfuncs->bmf_realloc +#define o_tmpfree o_tmpmfuncs->bmf_free + +#define o_log_prefix o_hdr->oh_log_prefix + +#ifdef LDAP_SLAPI +#define o_pb o_hdr->oh_pb +#define o_extensions o_hdr->oh_extensions +#endif - ber_int_t o_msgid; /* msgid 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 */ + BackendDB *o_bd; /* backend DB processing this op */ struct berval o_req_dn; /* DN of target of request */ struct berval o_req_ndn; @@ -2122,10 +2291,8 @@ typedef struct slap_op { #define orm_increment oq_modify.rs_increment #define ore_reqoid oq_extended.rs_reqoid +#define ore_flags oq_extended.rs_flags #define ore_reqdata oq_extended.rs_reqdata - - ldap_pvt_thread_t o_tid; /* thread handling this op */ - volatile sig_atomic_t o_abandon; /* abandon flag */ volatile sig_atomic_t o_cancel; /* cancel flag */ #define SLAP_CANCEL_NONE 0x00 @@ -2137,76 +2304,82 @@ typedef struct slap_op { char o_do_not_cache; /* don't cache groups from this op */ char o_is_auth_check; /* authorization in progress */ -#define SLAP_IGNORED_CONTROL -1 -#define SLAP_NO_CONTROL 0 -#define SLAP_NONCRITICAL_CONTROL 1 -#define SLAP_CRITICAL_CONTROL 2 - char o_managedsait; -#define get_manageDSAit(op) ((int)(op)->o_managedsait) +#define SLAP_CONTROL_NONE 0 +#define SLAP_CONTROL_IGNORED 1 +#define SLAP_CONTROL_NONCRITICAL 2 +#define SLAP_CONTROL_CRITICAL 3 +#define SLAP_CONTROL_MASK 3 + +/* spare bits for simple flags */ +#define SLAP_CONTROL_SHIFT 4 /* shift to reach data bits */ +#define SLAP_CONTROL_DATA0 0x10 +#define SLAP_CONTROL_DATA1 0x20 +#define SLAP_CONTROL_DATA2 0x40 +#define SLAP_CONTROL_DATA3 0x80 + + +#define _SCM(x) ((x) & SLAP_CONTROL_MASK) + + char o_ctrlflag[SLAP_MAX_CIDS]; /* per-control flags */ + void **o_controls; /* per-control state */ + +#define o_managedsait o_ctrlflag[slap_cids.sc_manageDSAit] +#define get_manageDSAit(op) _SCM((op)->o_managedsait) + +#define o_noop o_ctrlflag[slap_cids.sc_noOp] +#define o_proxy_authz o_ctrlflag[slap_cids.sc_proxyAuthz] +#define o_subentries o_ctrlflag[slap_cids.sc_subentries] - char o_noop; - char o_proxy_authz; +#define get_subentries(op) _SCM((op)->o_subentries) +#define o_subentries_visibility o_ctrlflag[slap_cids.sc_subentries] - char o_subentries; -#define get_subentries(op) ((int)(op)->o_subentries) - char o_subentries_visibility; -#define get_subentries_visibility(op) ((int)(op)->o_subentries_visibility) +#define set_subentries_visibility(op) ((op)->o_subentries |= SLAP_CONTROL_DATA0) +#define get_subentries_visibility(op) (((op)->o_subentries & SLAP_CONTROL_DATA0) != 0) - char o_assert; +#define o_assert o_ctrlflag[slap_cids.sc_assert] #define get_assert(op) ((int)(op)->o_assert) +#define o_assertion o_controls[slap_cids.sc_assert] +#define get_assertion(op) ((op)->o_assertion) - char o_valuesreturnfilter; +#define o_valuesreturnfilter o_ctrlflag[slap_cids.sc_valuesReturnFilter] +#define o_vrFilter o_controls[slap_cids.sc_valuesReturnFilter] #ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY - char o_permissive_modify; +#define o_permissive_modify o_ctrlflag[slap_cids.sc_permissiveModify] #define get_permissiveModify(op) ((int)(op)->o_permissive_modify) #else #define get_permissiveModify(op) (0) #endif #ifdef LDAP_CONTROL_X_DOMAIN_SCOPE - char o_domain_scope; +#define o_domain_scope o_ctrlflag[slap_cids.sc_domainScope] #define get_domainScope(op) ((int)(op)->o_domain_scope) #else #define get_domainScope(op) (0) #endif #ifdef LDAP_CONTROL_X_TREE_DELETE - char o_tree_delete; +#define o_tree_delete o_ctrlflag[slap_cids.sc_treeDelete] #define get_treeDelete(op) ((int)(op)->o_tree_delete) #else #define get_treeDelete(op) (0) #endif - char o_preread; - char o_postread; - AttributeName *o_preread_attrs; - AttributeName *o_postread_attrs; +#define o_preread o_ctrlflag[slap_cids.sc_preRead] +#define o_postread o_ctrlflag[slap_cids.sc_postRead] + +#define o_preread_attrs o_controls[slap_cids.sc_preRead] +#define o_postread_attrs o_controls[slap_cids.sc_postRead] - char o_pagedresults; +#define o_pagedresults o_ctrlflag[slap_cids.sc_pagedResults] +#define o_pagedresults_state o_controls[slap_cids.sc_pagedResults] #define get_pagedresults(op) ((int)(op)->o_pagedresults) - ber_int_t o_pagedresults_size; - PagedResultsState o_pagedresults_state; - - char o_sync; - char o_sync_mode; -#define SLAP_SYNC_NONE LDAP_SYNC_NONE -#define SLAP_SYNC_REFRESH LDAP_SYNC_REFRESH_ONLY -#define SLAP_SYNC_PERSIST LDAP_SYNC_RESERVED -#define SLAP_SYNC_REFRESH_AND_PERSIST LDAP_SYNC_REFRESH_AND_PERSIST - struct sync_cookie o_sync_state; - int o_sync_rhint; - struct berval o_sync_cid; - int o_sync_slog_size; - struct berval o_sync_csn; - struct berval o_sync_slog_omitcsn; - int o_sync_slog_len; - LDAP_STAILQ_HEAD(sl, slog_entry) o_sync_slog_list; - - int o_ps_entries; - int o_no_psearch; - LDAP_LIST_ENTRY(slap_op) o_ps_link; - LDAP_LIST_HEAD(pe, psid_entry) o_pm_list; + +#ifdef LDAP_DEVEL +#define o_sortedresults o_ctrlflag[slap_cids.sc_sortedResults] +#endif + +#define o_sync o_ctrlflag[slap_cids.sc_LDAPsync] AuthorizationInformation o_authz; @@ -2215,30 +2388,15 @@ typedef struct slap_op { slap_callback *o_callback; /* callback pointers */ LDAPControl **o_ctrls; /* controls */ - void *o_threadctx; /* thread pool thread context */ - void *o_tmpmemctx; /* slab malloc context */ - BerMemoryFunctions *o_tmpmfuncs; -#define o_tmpalloc o_tmpmfuncs->bmf_malloc -#define o_tmpcalloc o_tmpmfuncs->bmf_calloc -#define o_tmprealloc o_tmpmfuncs->bmf_realloc -#define o_tmpfree o_tmpmfuncs->bmf_free void *o_private; /* anything the backend needs */ LDAP_STAILQ_ENTRY(slap_op) o_next; /* next operation in list */ - Filter *o_assertion; /* Assert control filter */ -#define get_assertion(op) ((op)->o_assertion) - - ValuesReturnFilter *o_vrFilter; /* ValuesReturnFilter */ - int o_nocaching; int o_delete_glue_parent; -#ifdef LDAP_SLAPI - void *o_pb; /* NS-SLAPI plugin */ - void *o_extensions; /* NS-SLAPI plugin */ -#endif } Operation; +#define OPERATION_BUFFER_SIZE (sizeof(Operation)+sizeof(Opheader)+SLAP_MAX_CIDS*sizeof(void *)) #define send_ldap_error( op, rs, err, text ) do { \ (rs)->sr_err = err; (rs)->sr_text = text; \ @@ -2261,15 +2419,15 @@ typedef void (SEND_LDAP_INTERMEDIATE)( struct slap_op *op, struct slap_rep *rs); #define send_ldap_result( op, rs ) \ - (op->o_conn->c_send_ldap_result)( op, rs ) + ((op)->o_conn->c_send_ldap_result)( op, rs ) #define send_search_entry( op, rs ) \ - (op->o_conn->c_send_search_entry)( op, rs ) + ((op)->o_conn->c_send_search_entry)( op, rs ) #define send_search_reference( op, rs ) \ - (op->o_conn->c_send_search_reference)( op, rs ) + ((op)->o_conn->c_send_search_reference)( op, rs ) #define send_ldap_extended( op, rs ) \ - (op->o_conn->c_send_ldap_extended)( op, rs ) + ((op)->o_conn->c_send_ldap_extended)( op, rs ) #define send_ldap_intermediate( op, rs ) \ - (op->o_conn->c_send_ldap_intermediate)( op, rs ) + ((op)->o_conn->c_send_ldap_intermediate)( op, rs ) typedef struct slap_listener Listener; @@ -2431,47 +2589,20 @@ enum { typedef struct slap_counters_t { ldap_pvt_thread_mutex_t sc_sent_mutex; -#ifdef HAVE_GMP - mpz_t sc_bytes; - mpz_t sc_pdu; - mpz_t sc_entries; - mpz_t sc_refs; -#else /* ! HAVE_GMP */ - unsigned long sc_bytes; - unsigned long sc_pdu; - unsigned long sc_entries; - unsigned long sc_refs; -#endif /* ! HAVE_GMP */ + ldap_pvt_mp_t sc_bytes; + ldap_pvt_mp_t sc_pdu; + ldap_pvt_mp_t sc_entries; + ldap_pvt_mp_t sc_refs; ldap_pvt_thread_mutex_t sc_ops_mutex; -#ifdef HAVE_GMP - mpz_t sc_ops_completed; - mpz_t sc_ops_initiated; -#ifdef SLAPD_MONITOR - mpz_t sc_ops_completed_[SLAP_OP_LAST]; - mpz_t sc_ops_initiated_[SLAP_OP_LAST]; -#endif /* SLAPD_MONITOR */ -#else /* ! HAVE_GMP */ - unsigned long sc_ops_completed; - unsigned long sc_ops_initiated; + ldap_pvt_mp_t sc_ops_completed; + ldap_pvt_mp_t sc_ops_initiated; #ifdef SLAPD_MONITOR - unsigned long sc_ops_completed_[SLAP_OP_LAST]; - unsigned long sc_ops_initiated_[SLAP_OP_LAST]; + ldap_pvt_mp_t sc_ops_completed_[SLAP_OP_LAST]; + ldap_pvt_mp_t sc_ops_initiated_[SLAP_OP_LAST]; #endif /* SLAPD_MONITOR */ -#endif /* ! HAVE_GMP */ } slap_counters_t; -#define num_sent_mutex slap_counters.sc_sent_mutex -#define num_bytes_sent slap_counters.sc_bytes -#define num_pdu_sent slap_counters.sc_pdu -#define num_entries_sent slap_counters.sc_entries -#define num_refs_sent slap_counters.sc_refs -#define num_ops_mutex slap_counters.sc_ops_mutex -#define num_ops_completed slap_counters.sc_ops_completed -#define num_ops_initiated slap_counters.sc_ops_initiated -#define num_ops_completed_ slap_counters.sc_ops_completed_ -#define num_ops_initiated_ slap_counters.sc_ops_initiated_ - /* * Better know these all around slapd */ @@ -2487,8 +2618,8 @@ typedef struct slap_counters_t { #define SLAP_CTRL_HIDE 0x80000000U #endif -#define SLAP_CTRL_FRONTEND 0x00800000U -#define SLAP_CTRL_FRONTEND_SEARCH 0x00010000U /* for NOOP */ +#define SLAP_CTRL_GLOBAL 0x00800000U +#define SLAP_CTRL_GLOBAL_SEARCH 0x00010000U /* for NOOP */ #define SLAP_CTRL_OPFLAGS 0x0000FFFFU #define SLAP_CTRL_ABANDON 0x00000001U @@ -2512,11 +2643,11 @@ typedef int (SLAP_CTRL_PARSE_FN) LDAP_P(( LDAPControl *ctrl )); #define SLAP_SLAB_SIZE (1024*1024) +#define SLAP_SLAB_STACK 1 +#define SLAP_SLAB_SOBLOCK 64 -#if defined(LDAP_DEVEL) && defined(ENABLE_REWRITE) -/* use librewrite for sasl-regexp */ -#define SLAP_AUTH_REWRITE 1 -#endif /* LDAP_DEVEL && ENABLE_REWRITE */ +#define SLAP_ZONE_ALLOC 1 +#undef SLAP_ZONE_ALLOC #ifdef LDAP_COMP_MATCH /* @@ -2559,7 +2690,7 @@ typedef int (SLAP_CTRL_PARSE_FN) LDAP_P(( #define LDAP_COMP_FILTER_ITEM ((ber_tag_t) 0xa3U) #define LDAP_COMP_FILTER_UNDEFINED ((ber_tag_t) 0xa4U) -typedef struct slap_component_id{ +typedef struct slap_component_id { int ci_type; struct slap_component_id *ci_next; @@ -2568,6 +2699,7 @@ typedef struct slap_component_id{ ber_int_t ci_from_beginning; ber_int_t ci_count; ber_int_t ci_from_end; + ber_int_t ci_content; BerValue ci_select_value; char ci_all; } ci_val; @@ -2578,6 +2710,12 @@ typedef struct slap_component_reference { ComponentId *cr_curr; struct berval cr_string; int cr_len; + /* Component Indexing */ + int cr_asn_type_id; + slap_mask_t cr_indexmask; + AttributeDescription* cr_ad; + BerVarray cr_nvals; + struct slap_component_reference* cr_next; } ComponentReference; typedef struct slap_component_assertion { @@ -2585,6 +2723,7 @@ typedef struct slap_component_assertion { ber_int_t ca_use_def; MatchingRule *ca_ma_rule; struct berval ca_ma_value; + ComponentData ca_comp_data; /* componentized assertion */ struct slap_component_filter *ca_cf; MatchingRuleAssertion *ca_mra; } ComponentAssertion; @@ -2602,6 +2741,7 @@ typedef struct slap_component_filter { #define cf_and cf_un.cf_un_complex #define cf_or cf_un.cf_un_complex #define cf_not cf_un.cf_un_complex +#define cf_any cf_un.cf_un_complex struct slap_component_filter *cf_next; } ComponentFilter; @@ -2612,42 +2752,112 @@ typedef struct slap_component_assertion_value { char* cav_end; } ComponentAssertionValue; -#include "asn.h" - typedef int encoder_func LDAP_P(( void* b, void* comp)); struct slap_component_syntax_info; -typedef int decoder_func LDAP_P(( +typedef int gser_decoder_func LDAP_P(( + void* mem_op, void* b, struct slap_component_syntax_info** comp_syn_info, - unsigned int* len, + int* len, + int mode)); + +typedef int comp_free_func LDAP_P(( + void* b)); + +typedef int ber_decoder_func LDAP_P(( + void* mem_op, + void* b, + int tag, + int elmtLen, + struct slap_component_syntax_info* comp_syn_info, + int* len, int mode)); -typedef void* extract_component_from_tag_func LDAP_P(( - int *tag)); +typedef int ber_tag_decoder_func LDAP_P(( + void* mem_op, + void* b, + struct slap_component_syntax_info* comp_syn_info, + int* len, + int mode)); typedef void* extract_component_from_id_func LDAP_P(( + void* mem_op, ComponentReference* cr, void* comp )); +typedef void* convert_attr_to_comp_func LDAP_P (( + Attribute* a, + Syntax* syn, + struct berval* bv )); + +typedef void* alloc_nibble_func LDAP_P (( + int initial_size, + int increment_size )); + +typedef void free_nibble_func LDAP_P (( + void* nm )); + +struct slap_component_syntax_info; +typedef void convert_assert_to_comp_func LDAP_P (( + void *mem_op, + struct slap_component_syntax_info* csi_attr, + struct berval* bv, + struct slap_component_syntax_info** csi, + int* len, + int mode )); + +typedef int convert_asn_to_ldap_func LDAP_P (( + struct slap_component_syntax_info* csi, + struct berval *bv )); + +typedef void free_component_func LDAP_P (( + void* mem_op)); + +typedef int test_component_func LDAP_P (( + void* attr_mem_op, + void* assert_mem_op, + struct slap_component_syntax_info* csi, + struct slap_component_assertion* ca)); + +typedef void* test_membership_func LDAP_P (( + void* in )); + +typedef void* get_component_info_func LDAP_P (( + int in )); + +struct slap_component_syntax_info; + +typedef int component_encoder_func LDAP_P (( + void* mem_op, + struct slap_component_syntax_info* csi, + struct berval* nvals )); + typedef int allcomponent_matching_func LDAP_P(( char* oid, - void* component1, - void* component2 )); + struct slap_component_syntax_info* comp1, + struct slap_component_syntax_info* comp)); -typedef struct slap_component_desc{ +typedef struct slap_component_desc { + /* Don't change the order of following four fields */ int cd_tag; - ComponentId* cd_identifier; - encoder_func *cd_encoder; - decoder_func *cd_decoder; - extract_component_from_tag_func* cd_extract_t; + AttributeType *cd_comp_type; + struct berval cd_ad_type;/* ad_type, ad_cname */ + struct berval cd_ad_cname;/* ad_type, ad_cname */ + unsigned cd_flags; /*ad_flags*/ + int cd_type; + int cd_type_id; + encoder_func *cd_ldap_encoder; + encoder_func *cd_gser_encoder; + encoder_func *cd_ber_encoder; + gser_decoder_func *cd_gser_decoder; + ber_decoder_func *cd_ber_decoder; + comp_free_func *cd_free; extract_component_from_id_func* cd_extract_i; - AsnType cd_type; - AsnTypeId cd_type_id; - allcomponent_matching_func* cd_all_match; + allcomponent_matching_func *cd_all_match; } ComponentDesc; typedef struct slap_component_syntax_info { @@ -2655,19 +2865,85 @@ typedef struct slap_component_syntax_info { ComponentDesc* csi_comp_desc; } ComponentSyntaxInfo; -typedef struct asntype_to_matchingrule { - AsnTypeId atmr_typeId; - char* atmr_mr_name; - MatchingRule *atmr_mr; -} AsnTypetoMatchingRule; +#endif + +/* slab heap data structures */ + +struct slab_object { + void *so_ptr; + int so_blockhead; + LDAP_LIST_ENTRY(slab_object) so_link; +}; + +struct slab_heap { + void *sh_base; + void *sh_last; + void *sh_end; + int sh_stack; + int sh_maxorder; + unsigned char **sh_map; + LDAP_LIST_HEAD( sh_freelist, slab_object ) *sh_free; + LDAP_LIST_HEAD( sh_so, slab_object ) sh_sopool; +}; + +#ifdef SLAP_ZONE_ALLOC +#define SLAP_ZONE_SIZE 0x80000 /* 512KB */ +#define SLAP_ZONE_SHIFT 19 +#define SLAP_ZONE_INITSIZE 0x800000 /* 8MB */ +#define SLAP_ZONE_MAXSIZE 0x80000000/* 2GB */ +#define SLAP_ZONE_DELTA 0x800000 /* 8MB */ +#define SLAP_ZONE_ZOBLOCK 256 + +struct zone_object { + void *zo_ptr; + int zo_siz; + int zo_idx; + int zo_blockhead; + LDAP_LIST_ENTRY(zone_object) zo_link; +}; -typedef struct asntype_to_matchingrule_table { - char* atmr_oid; - struct asntype_to_matchingrule atmr_table[ASNTYPE_END]; - struct asntype_to_matchingrule_table* atmr_table_next; -} AsnTypetoMatchingRuleTable; +struct zone_latency_history { + double zlh_latency; + LDAP_STAILQ_ENTRY(zone_latency_history) zlh_next; +}; +struct zone_heap { + int zh_fd; + int zh_zonesize; + int zh_zoneorder; + int zh_numzones; + int zh_maxzones; + int zh_deltazones; + void **zh_zones; + ldap_pvt_thread_rdwr_t *zh_znlock; + Avlnode *zh_zonetree; + unsigned char ***zh_maps; + int *zh_seqno; + LDAP_LIST_HEAD( zh_freelist, zone_object ) *zh_free; + LDAP_LIST_HEAD( zh_so, zone_object ) zh_zopool; + ldap_pvt_thread_mutex_t zh_mutex; + ldap_pvt_thread_rdwr_t zh_lock; + double zh_ema_latency; + unsigned long zh_ema_samples; + LDAP_STAILQ_HEAD( zh_latency_history, zone_latency_history ) + zh_latency_history_queue; + int zh_latency_history_qlen; + int zh_latency_jump; + int zh_swapping; +}; #endif + +#define SLAP_BACKEND_INIT_MODULE(b) \ + static BackendInfo bi; \ + int \ + init_module( int argc, char *argv[] ) \ + { \ + bi.bi_type = #b ; \ + bi.bi_init = b ## _back_initialize; \ + backend_add( &bi ); \ + return 0; \ + } + LDAP_END_DECL #include "proto-slap.h"