X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=96f7747cdc61507b7078e96ddab5161b98aae9c7;hb=d6449b1d57964b189259f7388f03418fb09e3000;hp=724470f861bcfa6ecad01ef4b5896f3b09ae116f;hpb=cddf7e0e0055abe7bb434c560724a67de91a7ba0;p=openldap diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 724470f861..96f7747cdc 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -1,7 +1,7 @@ /* slap.h - stand alone ldap server include file */ /* $OpenLDAP$ */ /* - * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved. + * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved. * COPYING RESTRICTIONS APPLY, see COPYRIGHT file */ @@ -16,6 +16,7 @@ #include #include #include +#include #include #include #include @@ -32,16 +33,34 @@ #include #include "ldap_pvt_thread.h" +#include "ldap_queue.h" LDAP_BEGIN_DECL - -#define SERVICE_NAME OPENLDAP_PACKAGE "-slapd" -#define SLAPD_ANONYMOUS "cn=anonymous" +/* + * SLAPD Memory allocation macros + * + * Unlike ch_*() routines, these routines do not assert() upon + * allocation error. They are intended to be used instead of + * ch_*() routines where the caller has implemented proper + * checking for and handling of allocation errors. + * + * Patches to convert ch_*() calls to SLAP_*() calls welcomed. + */ +#define SLAP_MALLOC(s) ber_memalloc((s)) +#define SLAP_CALLOC(n,s) ber_memcalloc((n),(s)) +#define SLAP_REALLOC(p,s) ber_memrealloc((p),(s)) +#define SLAP_FREE(p) ber_memfree((p)) +#define SLAP_VFREE(v) ber_memvfree((void**)(v)) +#define SLAP_STRDUP(s) ber_strdup((s)) +#define SLAP_STRNDUP(s,l) ber_strndup((s),(l)) #ifdef f_next #undef f_next /* name conflict between sys/file.h on SCO and struct filter */ #endif +#define SERVICE_NAME OPENLDAP_PACKAGE "-slapd" +#define SLAPD_ANONYMOUS "cn=anonymous" + /* LDAPMod.mod_op value ===> Must be kept in sync with ldap.h! * * This is a value used internally by the backends. It is needed to allow @@ -51,14 +70,13 @@ LDAP_BEGIN_DECL */ #define SLAP_MOD_SOFTADD 0x1000 -#define ON (1) -#define OFF (-1) -#define UNDEFINED (0) - -#define MAXREMATCHES (10) +#define MAXREMATCHES (100) #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 */ @@ -119,8 +137,9 @@ LDAP_BEGIN_DECL #define SLAPD_ROLE_ATTR "roleOccupant" #define SLAPD_ROLE_CLASS "organizationalRole" +#ifdef SLAPD_ACI_ENABLED #define SLAPD_ACI_SYNTAX "1.3.6.1.4.1.4203.666.2.1" -#define SLAPD_ACI_ATTR "OpenLDAPaci" +#endif #define SLAPD_OCTETSTRING_SYNTAX "1.3.6.1.4.1.1466.115.121.1.40" @@ -160,7 +179,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 @@ -180,7 +199,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 @@ -192,7 +210,6 @@ typedef struct slap_ssf_set { #define SLAP_INDEX_SUBSTR_INITIAL_PREFIX '^' #define SLAP_INDEX_SUBSTR_FINAL_PREFIX '$' #define SLAP_INDEX_CONT_PREFIX '.' /* prefix for continuation keys */ -#define SLAP_INDEX_UNKNOWN_PREFIX '?' /* prefix for unknown keys */ #define SLAP_SYNTAX_MATCHINGRULES_OID "1.3.6.1.4.1.1466.115.121.1.30" #define SLAP_SYNTAX_ATTRIBUTETYPES_OID "1.3.6.1.4.1.1466.115.121.1.3" @@ -201,22 +218,26 @@ typedef struct slap_ssf_set { /* * represents schema information for a database */ -#define SLAP_SCHERR_OUTOFMEM 1 -#define SLAP_SCHERR_CLASS_NOT_FOUND 2 -#define SLAP_SCHERR_CLASS_BAD_USAGE 3 -#define SLAP_SCHERR_ATTR_NOT_FOUND 4 -#define SLAP_SCHERR_ATTR_BAD_USAGE 5 -#define SLAP_SCHERR_DUP_CLASS 6 -#define SLAP_SCHERR_DUP_ATTR 7 -#define SLAP_SCHERR_DUP_SYNTAX 8 -#define SLAP_SCHERR_DUP_RULE 9 -#define SLAP_SCHERR_NO_NAME 10 -#define SLAP_SCHERR_ATTR_INCOMPLETE 11 -#define SLAP_SCHERR_MR_NOT_FOUND 12 -#define SLAP_SCHERR_SYN_NOT_FOUND 13 -#define SLAP_SCHERR_MR_INCOMPLETE 14 -#define SLAP_SCHERR_NOT_SUPPORTED 15 -#define SLAP_SCHERR_BAD_DESCR 16 +#define SLAP_SCHERR_OUTOFMEM 1 +#define SLAP_SCHERR_CLASS_NOT_FOUND 2 +#define SLAP_SCHERR_CLASS_BAD_USAGE 3 +#define SLAP_SCHERR_CLASS_BAD_SUP 4 +#define SLAP_SCHERR_CLASS_DUP 5 +#define SLAP_SCHERR_ATTR_NOT_FOUND 6 +#define SLAP_SCHERR_ATTR_BAD_USAGE 7 +#define SLAP_SCHERR_ATTR_BAD_SUP 8 +#define SLAP_SCHERR_ATTR_INCOMPLETE 9 +#define SLAP_SCHERR_ATTR_DUP 10 +#define SLAP_SCHERR_MR_NOT_FOUND 11 +#define SLAP_SCHERR_MR_INCOMPLETE 12 +#define SLAP_SCHERR_MR_DUP 13 +#define SLAP_SCHERR_SYN_NOT_FOUND 14 +#define SLAP_SCHERR_SYN_DUP 15 +#define SLAP_SCHERR_NO_NAME 16 +#define SLAP_SCHERR_NOT_SUPPORTED 17 +#define SLAP_SCHERR_BAD_DESCR 18 +#define SLAP_SCHERR_OIDM 19 +#define SLAP_SCHERR_LAST SLAP_SCHERR_OIDM typedef union slap_sockaddr { struct sockaddr sa_addr; @@ -229,6 +250,10 @@ typedef union slap_sockaddr { #endif } Sockaddr; +#ifdef LDAP_PF_INET6 +extern int slap_inet4or6; +#endif + typedef struct slap_oid_macro { struct berval som_oid; char **som_names; @@ -246,7 +271,7 @@ typedef int slap_syntax_validate_func LDAP_P(( typedef int slap_syntax_transform_func LDAP_P(( struct slap_syntax *syntax, struct berval * in, - struct berval ** out)); + struct berval * out)); typedef struct slap_syntax { LDAPSyntax ssyn_syn; @@ -255,13 +280,13 @@ typedef struct slap_syntax { #define ssyn_extensions ssyn_syn.syn_extensions ber_len_t ssyn_oidlen; - unsigned ssyn_flags; + unsigned int ssyn_flags; -#define SLAP_SYNTAX_NONE 0x00U -#define SLAP_SYNTAX_BLOB 0x01U /* syntax treated as blob (audio) */ -#define SLAP_SYNTAX_BINARY 0x02U /* binary transfer required (certificate) */ -#define SLAP_SYNTAX_BER 0x04U /* stored using BER encoding (binary,certificate) */ -#define SLAP_SYNTAX_HIDE 0x80U /* hide (do not publish) */ +#define SLAP_SYNTAX_NONE 0x0000U +#define SLAP_SYNTAX_BLOB 0x0001U /* syntax treated as blob (audio) */ +#define SLAP_SYNTAX_BINARY 0x0002U /* binary transfer required (certificate) */ +#define SLAP_SYNTAX_BER 0x0004U /* stored in BER encoding (certificate) */ +#define SLAP_SYNTAX_HIDE 0x8000U /* hide (do not publish) */ slap_syntax_validate_func *ssyn_validate; slap_syntax_transform_func *ssyn_normalize; @@ -282,10 +307,22 @@ typedef struct slap_syntax { #define slap_syntax_is_ber(s) slap_syntax_is_flag((s),SLAP_SYNTAX_BER) #define slap_syntax_is_hidden(s) slap_syntax_is_flag((s),SLAP_SYNTAX_HIDE) +typedef struct slap_syntax_defs_rec { + char *sd_desc; + int sd_flags; + slap_syntax_validate_func *sd_validate; + slap_syntax_transform_func *sd_normalize; + slap_syntax_transform_func *sd_pretty; +#ifdef SLAPD_BINARY_CONVERSION + slap_syntax_transform_func *sd_ber2str; + slap_syntax_transform_func *sd_str2ber; +#endif +} slap_syntax_defs_rec; + /* X -> Y Converter */ typedef int slap_mr_convert_func LDAP_P(( struct berval * in, - struct berval ** out )); + struct berval * out )); /* Normalizer */ typedef int slap_mr_normalize_func LDAP_P(( @@ -293,7 +330,7 @@ typedef int slap_mr_normalize_func LDAP_P(( struct slap_syntax *syntax, /* NULL if in is asserted value */ struct slap_matching_rule *mr, struct berval * in, - struct berval ** out )); + struct berval * out )); /* Match (compare) function */ typedef int slap_mr_match_func LDAP_P(( @@ -311,8 +348,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, - struct berval **values, - struct berval ***keys )); + BerVarray values, + BerVarray *keys )); /* Filter index function */ typedef int slap_mr_filter_func LDAP_P(( @@ -322,14 +359,16 @@ typedef int slap_mr_filter_func LDAP_P(( struct slap_matching_rule *mr, struct berval *prefix, void * assertValue, - struct berval ***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_TYPE_MASK 0xFF00U +#define SLAP_MR_HIDE 0x8000U + +#define SLAP_MR_TYPE_MASK 0x0F00U #define SLAP_MR_SUBTYPE_MASK 0x00F0U #define SLAP_MR_USAGE 0x000FU @@ -353,9 +392,9 @@ typedef struct slap_matching_rule { * the provided value is expected to conform to the * attribute's value syntax. */ -#define SLAP_MR_ASSERTION_SYNTAX_MATCH 0x0000U -#define SLAP_MR_VALUE_SYNTAX_MATCH 0x0001U -#define SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH 0x0003U +#define SLAP_MR_ASSERTION_SYNTAX_MATCH 0x0000U +#define SLAP_MR_VALUE_SYNTAX_MATCH 0x0001U +#define SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH 0x0003U #define SLAP_IS_MR_ASSERTION_SYNTAX_MATCH( usage ) \ (!((usage) & SLAP_MR_VALUE_SYNTAX_MATCH)) @@ -387,7 +426,28 @@ typedef struct slap_matching_rule { #define smr_extensions smr_mrule.mr_extensions } MatchingRule; -struct slap_attr_desc; +typedef struct slap_mrule_defs_rec { + char * mrd_desc; + slap_mask_t mrd_usage; + slap_mr_convert_func * mrd_convert; + slap_mr_normalize_func * mrd_normalize; + slap_mr_match_func * mrd_match; + slap_mr_indexer_func * mrd_indexer; + slap_mr_filter_func * mrd_filter; + + char * mrd_associated; +} slap_mrule_defs_rec; + +struct slap_backend_db; +struct slap_entry; +struct slap_attr; + +typedef int (AttributeTypeSchemaCheckFN)( + struct slap_backend_db *be, + struct slap_entry *e, + struct slap_attr *attr, + const char** text, + char *textbuf, size_t textlen ); typedef struct slap_attribute_type { LDAPAttributeType sat_atype; @@ -398,15 +458,23 @@ typedef struct slap_attribute_type { MatchingRule *sat_approx; MatchingRule *sat_ordering; MatchingRule *sat_substr; - Syntax *sat_syntax; - struct slap_attr_desc *sat_ad; + Syntax *sat_syntax; + + AttributeTypeSchemaCheckFN *sat_check; + +#define SLAP_AT_NONE 0x0000U +#define SLAP_AT_ABSTRACT 0x0100U /* cannot be instantiated */ +#define SLAP_AT_FINAL 0x0200U /* cannot be subtyped */ +#define SLAP_AT_HIDE 0x8000U /* hide attribute */ + 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 @@ -414,8 +482,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) @@ -424,23 +495,66 @@ typedef struct slap_attribute_type { #define is_at_obsolete(at) ((at)->sat_obsolete) #define is_at_no_user_mod(at) ((at)->sat_no_user_mod) +struct slap_object_class; + +typedef int (ObjectClassSchemaCheckFN)( + struct slap_backend_db *be, + struct slap_entry *e, + struct slap_object_class *oc, + const char** text, + char *textbuf, size_t textlen ); + typedef struct slap_object_class { LDAPObjectClass soc_oclass; struct slap_object_class **soc_sups; - AttributeType **soc_required; - AttributeType **soc_allowed; - 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 + AttributeType **soc_required; + AttributeType **soc_allowed; + 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 #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; +#define SLAP_OC_ALIAS 0x0001 +#define SLAP_OC_REFERRAL 0x0002 +#define SLAP_OC_SUBENTRY 0x0004 +#define SLAP_OC_DYNAMICOBJECT 0x0008 +#define SLAP_OC_COLLECTIVEATTRIBUTESUBENTRY 0x0010 +#define SLAP_OC__MASK 0x001F +#define SLAP_OC__END 0x0020 +#define SLAP_OC_OPERATIONAL 0x4000 +#define SLAP_OC_HIDE 0x8000 + +#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 ) @@ -451,12 +565,22 @@ typedef struct slap_attr_desc { struct berval ad_cname; /* canonical name, must be specified */ struct berval ad_lang; /* empty if no language tags */ unsigned ad_flags; -#define SLAP_DESC_NONE 0x0U -#define SLAP_DESC_BINARY 0x1U +#define SLAP_DESC_NONE 0x00U +#define SLAP_DESC_BINARY 0x01U +#define SLAP_DESC_LANG_RANGE 0x80U } AttributeDescription; -#define slap_ad_is_lang(ad) ( (ad)->ad_lang.bv_len != 0 ) -#define slap_ad_is_binary(ad) ( (int)((ad)->ad_flags & SLAP_DESC_BINARY) ? 1 : 0 ) +typedef struct slap_attr_name { + struct berval an_name; + AttributeDescription *an_desc; + ObjectClass *an_oc; +} AttributeName; + +#define slap_ad_is_lang(ad) ( (ad)->ad_lang.bv_len != 0 ) +#define slap_ad_is_lang_range(ad) \ + ( ((ad)->ad_flags & SLAP_DESC_LANG_RANGE) ? 1 : 0 ) +#define slap_ad_is_binary(ad) \ + ( ((ad)->ad_flags & SLAP_DESC_BINARY) ? 1 : 0 ) /* * pointers to schema elements used internally @@ -467,38 +591,54 @@ struct slap_internal_schema { ObjectClass *si_oc_extensibleObject; ObjectClass *si_oc_alias; ObjectClass *si_oc_referral; + ObjectClass *si_oc_rootdse; ObjectClass *si_oc_subentry; ObjectClass *si_oc_subschema; - ObjectClass *si_oc_rootdse; + ObjectClass *si_oc_monitor; + ObjectClass *si_oc_collectiveAttributeSubentry; + ObjectClass *si_oc_dynamicObject; /* objectClass attribute descriptions */ AttributeDescription *si_ad_objectClass; /* operational attribute descriptions */ AttributeDescription *si_ad_structuralObjectClass; - AttributeDescription *si_ad_entryUUID; - AttributeDescription *si_ad_entryCSN; AttributeDescription *si_ad_creatorsName; AttributeDescription *si_ad_createTimestamp; AttributeDescription *si_ad_modifiersName; AttributeDescription *si_ad_modifyTimestamp; AttributeDescription *si_ad_hasSubordinates; AttributeDescription *si_ad_subschemaSubentry; + AttributeDescription *si_ad_collectiveSubentries; + AttributeDescription *si_ad_collectiveExclusions; + AttributeDescription *si_ad_entryUUID; + AttributeDescription *si_ad_entryCSN; /* root DSE attribute descriptions */ + AttributeDescription *si_ad_altServer; AttributeDescription *si_ad_namingContexts; AttributeDescription *si_ad_supportedControl; AttributeDescription *si_ad_supportedExtension; AttributeDescription *si_ad_supportedLDAPVersion; AttributeDescription *si_ad_supportedSASLMechanisms; AttributeDescription *si_ad_supportedFeatures; + AttributeDescription *si_ad_monitorContext; + AttributeDescription *si_ad_vendorName; + AttributeDescription *si_ad_vendorVersion; + + /* subentry attribute descriptions */ + AttributeDescription *si_ad_administrativeRole; + AttributeDescription *si_ad_subtreeSpecification; /* subschema subentry attribute descriptions */ + AttributeDescription *si_ad_ditStructureRules; + AttributeDescription *si_ad_ditContentRules; + AttributeDescription *si_ad_nameForms; AttributeDescription *si_ad_objectClasses; AttributeDescription *si_ad_attributeTypes; AttributeDescription *si_ad_ldapSyntaxes; AttributeDescription *si_ad_matchingRules; - AttributeDescription *si_ad_matchingRulesUse; + AttributeDescription *si_ad_matchingRuleUse; /* Aliases & Referrals */ AttributeDescription *si_ad_aliasedObjectName; @@ -507,13 +647,24 @@ struct slap_internal_schema { /* Access Control Internals */ AttributeDescription *si_ad_entry; AttributeDescription *si_ad_children; + AttributeDescription *si_ad_saslAuthzTo; + AttributeDescription *si_ad_saslAuthzFrom; #ifdef SLAPD_ACI_ENABLED AttributeDescription *si_ad_aci; #endif + /* dynamic entries */ + AttributeDescription *si_ad_entryTtl; + AttributeDescription *si_ad_dynamicSubtrees; + /* Other attributes descriptions */ + AttributeDescription *si_ad_distinguishedName; + AttributeDescription *si_ad_name; + AttributeDescription *si_ad_cn; AttributeDescription *si_ad_userPassword; +#ifdef SLAPD_AUTHPASSWD AttributeDescription *si_ad_authPassword; +#endif #ifdef LDAP_API_FEATURE_X_OPENLDAP_V2_KBIND AttributeDescription *si_ad_krbName; #endif @@ -526,28 +677,29 @@ struct slap_internal_schema { MatchingRule *si_mr_integerMatch; /* Syntaxes */ + Syntax *si_syn_octetString; Syntax *si_syn_distinguishedName; Syntax *si_syn_integer; }; typedef struct slap_attr_assertion { AttributeDescription *aa_desc; - struct berval *aa_value; + struct berval aa_value; } AttributeAssertion; typedef struct slap_ss_assertion { AttributeDescription *sa_desc; - struct berval *sa_initial; - struct berval **sa_any; - struct berval *sa_final; + struct berval sa_initial; + struct berval *sa_any; + struct berval sa_final; } SubstringsAssertion; typedef struct slap_mr_assertion { - MatchingRule *ma_rule; /* optional */ - struct berval ma_rule_text; /* optional */ + MatchingRule *ma_rule; /* optional */ + struct berval ma_rule_text; /* optional */ AttributeDescription *ma_desc; /* optional */ int ma_dnattrs; /* boolean */ - struct berval *ma_value; /* required */ + struct berval ma_value; /* required */ } MatchingRuleAssertion; /* @@ -590,7 +742,7 @@ typedef struct slap_filter { #define f_sub_final f_un.f_un_ssa->sa_final #define f_mra f_un.f_un_mra #define f_mr_rule f_un.f_un_mra->ma_rule -#define f_mr_rule_text f_un.f_un_mra->ma_rule_text +#define f_mr_rule_text f_un.f_un_mra->ma_rule_text #define f_mr_desc f_un.f_un_mra->ma_desc #define f_mr_value f_un.f_un_mra->ma_value #define f_mr_dnattrs f_un.f_un_mra->ma_dnattrs @@ -611,13 +763,42 @@ typedef struct slap_filter { /* compare routines can return undefined */ #define SLAPD_COMPARE_UNDEFINED ((ber_int_t) -1) +typedef struct slap_valuesreturnfilter { + ber_tag_t f_choice; + + union vrf_un_u { + /* precomputed result */ + ber_int_t f_un_result; + + /* DN */ + char *f_un_dn; + + /* present */ + AttributeDescription *f_un_desc; + + /* simple value assertion */ + AttributeAssertion *f_un_ava; + + /* substring assertion */ + SubstringsAssertion *f_un_ssa; + + /* matching rule assertion */ + MatchingRuleAssertion *f_un_mra; + } f_un; + + struct slap_valuesreturnfilter *f_next; +} ValuesReturnFilter; + /* * represents an attribute (description + values) */ typedef struct slap_attr { AttributeDescription *a_desc; - struct berval **a_vals; + BerVarray a_vals; struct slap_attr *a_next; + unsigned a_flags; +#define SLAP_ATTR_IXADD 0x1U +#define SLAP_ATTR_IXDEL 0x2U } Attribute; @@ -647,6 +828,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; @@ -657,13 +842,15 @@ typedef struct slap_entry { typedef struct slap_mod { int sm_op; AttributeDescription *sm_desc; - struct berval **sm_bvalues; + struct berval sm_type; + BerVarray sm_bvalues; } Modification; typedef struct slap_mod_list { Modification sml_mod; #define sml_op sml_mod.sm_op #define sml_desc sml_mod.sm_desc +#define sml_type sml_mod.sm_type #define sml_bvalues sml_mod.sm_bvalues struct slap_mod_list *sml_next; } Modifications; @@ -711,7 +898,7 @@ typedef enum slap_style_e { typedef struct slap_authz_info { ber_tag_t sai_method; /* LDAP_AUTH_* from */ - char * sai_mech; /* SASL Mechanism */ + struct berval sai_mech; /* SASL Mechanism */ struct berval sai_dn; /* DN for reporting purposes */ struct berval sai_ndn; /* Normalized DN */ @@ -791,16 +978,19 @@ typedef struct slap_access { slap_style_t a_dn_style; AttributeDescription *a_dn_at; int a_dn_self; + int a_dn_expand; slap_style_t a_peername_style; - char *a_peername_pat; + struct berval a_peername_pat; slap_style_t a_sockname_style; - char *a_sockname_pat; + struct berval a_sockname_pat; slap_style_t a_domain_style; - char *a_domain_pat; + struct berval a_domain_pat; + int a_domain_expand; + slap_style_t a_sockurl_style; - char *a_sockurl_pat; + struct berval a_sockurl_pat; slap_style_t a_set_style; struct berval a_set_pat; @@ -824,7 +1014,7 @@ typedef struct slap_acl { slap_style_t acl_dn_style; regex_t acl_dn_re; struct berval acl_dn_pat; - struct berval **acl_attrs; + AttributeName *acl_attrs; /* "by" part: list of who has what access to the entries */ Access *acl_access; @@ -832,6 +1022,26 @@ typedef struct slap_acl { struct slap_acl *acl_next; } AccessControl; +typedef struct slap_acl_state { + unsigned as_recorded; +#define ACL_STATE_NOT_RECORDED 0x0 +#define ACL_STATE_RECORDED_VD 0x1 +#define ACL_STATE_RECORDED_NV 0x2 +#define ACL_STATE_RECORDED 0x3 + + /* Access state */ + AccessControl *as_vd_acl; + slap_mask_t as_vd_acl_mask; + regmatch_t as_vd_acl_matches[MAXREMATCHES]; + int as_vd_acl_count; + + Access *as_vd_access; + int as_vd_access_count; + + int as_result; +} AccessControlState; +#define ACL_STATE_INIT { ACL_STATE_NOT_RECORDED, NULL, 0UL, { { 0, 0 } }, 0, NULL, 0, 0 } + /* * replog moddn param structure */ @@ -864,7 +1074,9 @@ LDAP_SLAPD_V (int) slapMode; struct slap_replica_info { char *ri_host; /* supersedes be_replica */ - struct berval **ri_nsuffix; /* array of suffixes this replica accepts */ + BerVarray ri_nsuffix; /* array of suffixes this replica accepts */ + AttributeName *ri_attrs; /* attrs to replicate, NULL=all */ + int ri_exclude; /* 1 => exclude ri_attrs */ }; struct slap_limits_set { @@ -889,13 +1101,14 @@ struct slap_limits { #define SLAP_LIMITS_REGEX 0x0005 #define SLAP_LIMITS_ANONYMOUS 0x0006 #define SLAP_LIMITS_USERS 0x0007 +#define SLAP_LIMITS_ANY 0x0008 regex_t lm_dn_regex; /* regex data for REGEX */ /* * normalized DN for EXACT, BASE, ONE, SUBTREE, CHILDREN; * pattern for REGEX; NULL for ANONYMOUS, USERS */ - struct berval *lm_dn_pat; + struct berval lm_dn_pat; struct slap_limits_set lm_limits; }; @@ -945,6 +1158,23 @@ struct slap_backend_db { #define be_sync bd_info->bi_tool_sync #endif +#define SLAP_BFLAG_NOLASTMOD 0x0001U +#define SLAP_BFLAG_GLUE_INSTANCE 0x0010U /* a glue backend */ +#define SLAP_BFLAG_GLUE_SUBORDINATE 0x0020U /* child of a glue hierarchy */ +#define SLAP_BFLAG_GLUE_LINKED 0x0040U /* child is connected to parent */ +#define SLAP_BFLAG_ALIASES 0x0100U +#define SLAP_BFLAG_REFERRALS 0x0200U +#define SLAP_BFLAG_SUBENTRIES 0x0400U +#define SLAP_BFLAG_MONITOR 0x1000U +#define SLAP_BFLAG_DYNAMIC 0x2000U + slap_mask_t be_flags; +#define SLAP_LASTMOD(be) (!((be)->be_flags & SLAP_BFLAG_NOLASTMOD)) +#define SLAP_ALIASES(be) ((be)->be_flags & SLAP_BFLAG_ALIASES) +#define SLAP_REFERRALS(be) ((be)->be_flags & SLAP_BFLAG_REFERRALS) +#define SLAP_SUBENTRIES(be) ((be)->be_flags & SLAP_BFLAG_SUBENTRIES) +#define SLAP_MONITOR(be) ((be)->be_flags & SLAP_BFLAG_MONITOR) +#define SLAP_DYNAMIC(be) ((be)->be_flags & SLAP_BFLAG_DYNAMIC) + slap_mask_t be_restrictops; /* restriction operations */ #define SLAP_RESTRICT_OP_ADD 0x0001U #define SLAP_RESTRICT_OP_BIND 0x0002U @@ -970,7 +1200,9 @@ struct slap_backend_db { #define SLAP_DISALLOW_BIND_ANON 0x0001U /* no anonymous */ #define SLAP_DISALLOW_BIND_SIMPLE 0x0002U /* simple authentication */ -#define SLAP_DISALLOW_BIND_KRBV4 0x0004U /* Kerberos V4 authentication */ +#define SLAP_DISALLOW_BIND_SIMPLE_UNPROTECTED \ + 0x0004U /* unprotected simple auth */ +#define SLAP_DISALLOW_BIND_KRBV4 0x0008U /* Kerberos V4 authentication */ #define SLAP_DISALLOW_TLS_2_ANON 0x0010U /* StartTLS -> Anonymous */ #define SLAP_DISALLOW_TLS_AUTHC 0x0020U /* TLS while authenticated */ @@ -986,9 +1218,13 @@ struct slap_backend_db { slap_ssf_set_t be_ssf_set; /* these should be renamed from be_ to bd_ */ - struct berval **be_suffix; /* the DN suffixes of data in this backend */ - struct berval **be_nsuffix; /* the normalized DN suffixes in this backend */ - struct berval **be_suffixAlias; /* pairs of DN suffix aliases and deref values */ + BerVarray be_suffix; /* the DN suffixes of data in this backend */ + BerVarray be_nsuffix; /* the normalized DN suffixes in this backend */ + BerVarray be_suffixAlias; /* pairs of DN suffix aliases and deref values */ +#ifdef SLAPD_SCHEMA_DN + struct berval be_schemadn; /* per-backend subschema subentry DN */ + struct berval be_schemandn; /* normalized subschema DN */ +#endif struct berval be_rootdn; /* the magic "root" name (DN) for this db */ struct berval be_rootndn; /* the magic "root" normalized name (DN) for this db */ struct berval be_rootpw; /* the magic "root" password for this db */ @@ -1002,15 +1238,8 @@ 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) */ - struct berval **be_update_refs; /* where to refer modifying clients to */ + BerVarray be_update_refs; /* where to refer modifying clients to */ char *be_realm; - int be_lastmod; /* keep track of lastmodified{by,time} */ - -#define SLAP_GLUE_INSTANCE 0x01 /* a glue backend */ -#define SLAP_GLUE_SUBORDINATE 0x02 /* child of a glue hierarchy */ -#define SLAP_GLUE_LINKED 0x04 /* child is connected to parent */ - - int be_glueflags; /* */ void *be_private; /* anything the backend database needs */ }; @@ -1045,8 +1274,8 @@ typedef int (BI_op_search) LDAP_P((BackendDB *bd, struct berval *base, struct berval *nbase, int scope, int deref, int slimit, int tlimit, - Filter *f, const char *filterstr, - struct berval **attrs, int attrsonly)); + Filter *f, struct berval *filterstr, + AttributeName *attrs, int attrsonly)); typedef int (BI_op_compare)LDAP_P((BackendDB *bd, struct slap_conn *c, struct slap_op *o, struct berval *dn, struct berval *ndn, @@ -1081,7 +1310,7 @@ typedef int (BI_op_extended) LDAP_P(( struct berval ** rspdata, LDAPControl *** rspctrls, const char ** text, - struct berval *** refs )); + BerVarray *refs )); typedef int (BI_entry_release_rw) LDAP_P((BackendDB *bd, struct slap_conn *c, struct slap_op *o, @@ -1104,11 +1333,11 @@ 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, - struct berval ***vals )); + BerVarray *vals )); typedef int (BI_operational) LDAP_P((Backend *bd, struct slap_conn *c, struct slap_op *o, - Entry *e, struct berval **attrs, int opattrs, Attribute **a )); + Entry *e, AttributeName *attrs, int opattrs, Attribute **a )); typedef int (BI_connection_init) LDAP_P((BackendDB *bd, struct slap_conn *c)); @@ -1120,12 +1349,13 @@ 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 )); struct slap_backend_info { - char *bi_type; /* type of backend */ + char *bi_type; /* type of backend */ /* * per backend type routines: @@ -1243,64 +1473,97 @@ 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 *, - struct berval **, 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 *, struct berval **, + 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; + +/* + * Paged Results state + */ +typedef unsigned long PagedResultsCookie; +typedef struct slap_paged_state { + Backend *ps_be; + PagedResultsCookie ps_cookie; + ID ps_id; +} PagedResultsState; + /* * 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 + unsigned long o_opid; /* id of this operation */ + unsigned long o_connid; /* id of conn initiating this op */ - ldap_pvt_thread_t o_tid; /* thread handling this op */ + 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 */ - BerElement *o_ber; /* ber of the request */ + ldap_pvt_thread_t o_tid; /* thread handling this op */ - ber_tag_t o_tag; /* tag of the request */ - time_t o_time; /* time op was initiated */ + volatile sig_atomic_t o_abandon; /* abandon flag */ - AuthorizationInformation o_authz; + char o_do_not_cache; /* don't cache from this op */ - ber_int_t o_protocol; /* version of the LDAP protocol used by client */ +#define SLAP_NO_CONTROL 0 +#define SLAP_NONCRITICAL_CONTROL 1 +#define SLAP_CRITICAL_CONTROL 2 + char o_managedsait; + char o_noop; + char o_subentries; + char o_subentries_visibility; + char o_valuesreturnfilter; - LDAPControl **o_ctrls; /* controls */ + char o_pagedresults; + ber_int_t o_pagedresults_size; + PagedResultsState o_pagedresults_state; - unsigned long o_connid; /* id of conn initiating this op */ +#ifdef LDAP_CONNECTIONLESS + Sockaddr o_peeraddr; /* UDP peer address */ +#endif + AuthorizationInformation o_authz; - 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 */ + BerElement *o_ber; /* ber of the request */ + slap_callback *o_callback; /* callback pointers */ + LDAPControl **o_ctrls; /* controls */ + + void *o_threadctx; /* thread pool thread context */ + void *o_private; /* anything the backend needs */ - struct slap_op *o_next; /* next operation in list */ - void *o_private; /* anything the backend needs */ - void *o_glue; /* for the glue backend */ + LDAP_STAILQ_ENTRY(slap_op) o_next; /* next operation in list */ + ValuesReturnFilter *vrFilter; /* Structure represents ValuesReturnFilter */ } Operation; +#define get_manageDSAit(op) ((int)(op)->o_managedsait) +#define get_subentries(op) ((int)(op)->o_subentries) +#define get_subentries_visibility(op) ((int)(op)->o_subentries_visibility) + /* * Caches the result of a backend_group check for ACL evaluation */ typedef struct slap_gacl { - struct slap_gacl *next; - Backend *be; - ObjectClass *oc; - AttributeDescription *at; - int res; - ber_len_t len; - char ndn[1]; + struct slap_gacl *ga_next; + Backend *ga_be; + ObjectClass *ga_oc; + AttributeDescription *ga_at; + int ga_res; + ber_len_t ga_len; + char ga_ndn[1]; } GroupAssertion; /* @@ -1318,20 +1581,17 @@ typedef struct slap_conn { time_t c_activitytime; /* when the connection was last used */ unsigned long c_connid; /* id of this connection for stats*/ - char *c_listener_url; /* listener URL */ - char *c_peer_domain; /* DNS name of client */ - char *c_peer_name; /* peer name (trans=addr:port) */ - char *c_sock_name; /* sock name (trans=addr:port) */ + struct berval c_listener_url; /* listener URL */ + struct berval c_peer_domain; /* DNS name of client */ + struct berval c_peer_name; /* peer name (trans=addr:port) */ + struct berval c_sock_name; /* sock name (trans=addr:port) */ /* only can be changed by binding thread */ int c_sasl_bind_in_progress; /* multi-op bind in progress */ - char *c_sasl_bind_mech; /* mech in progress */ - char *c_cdn; + struct berval c_sasl_bind_mech; /* mech in progress */ + struct berval c_sasl_dn; /* temporary storage */ - /* authentication backend */ - Backend *c_authc_backend; - - /* authorization backend - normally same as c_authc_backend */ + /* authorization backend */ Backend *c_authz_backend; AuthorizationInformation c_authz; @@ -1339,8 +1599,8 @@ typedef struct slap_conn { ber_int_t c_protocol; /* version of the LDAP protocol used by client */ - Operation *c_ops; /* list of operations being processed */ - Operation *c_pending_ops; /* list of pending operations */ + LDAP_STAILQ_HEAD(c_o, slap_op) c_ops; /* list of operations being processed */ + LDAP_STAILQ_HEAD(c_po, slap_op) c_pending_ops; /* list of pending operations */ ldap_pvt_thread_mutex_t c_write_mutex; /* only one pdu written at a time */ ldap_pvt_thread_cond_t c_write_cv; /* used to wait for sd write-ready*/ @@ -1358,10 +1618,14 @@ typedef struct slap_conn { int c_sasl_layers; /* true if we need to install SASL i/o handlers */ void *c_sasl_context; /* SASL session context */ void *c_sasl_extra; /* SASL session extra stuff */ + struct slap_op *c_sasl_bindop; /* set to current op if it's a bind */ + ldap_pvt_thread_mutex_t c_sasl_bindmutex; /* lock for bindop */ + + PagedResultsState c_pagedresults_state; /* paged result state */ - long c_n_ops_received; /* num of ops received (next op_id) */ + long c_n_ops_received; /* num of ops received (next op_id) */ long c_n_ops_executing; /* num of ops currently executing */ - long c_n_ops_pending; /* num of ops pending execution */ + long c_n_ops_pending; /* num of ops pending execution */ long c_n_ops_completed; /* num of ops completed */ long c_n_get; /* num of get calls */ @@ -1382,24 +1646,41 @@ typedef struct slap_conn { #define Statslog( level, fmt, connid, opid, arg1, arg2, arg3 ) #endif +/* + * listener; need to access it from monitor backend + */ +typedef struct slap_listener { + char* sl_url; + char* sl_name; +#ifdef HAVE_TLS + int sl_is_tls; +#endif +#ifdef LDAP_CONNECTIONLESS + int sl_is_udp; /* UDP listener is also data port */ +#endif + ber_socket_t sl_sd; + Sockaddr sl_sa; +#define sl_addr sl_sa.sa_in_addr +} Listener; -#define SASLREGEX_REPLACE 10 -#define SASL_AUTHZ_SOURCE_ATTR "saslAuthzTo" -#define SASL_AUTHZ_DEST_ATTR "saslAuthzFrom" - -typedef struct sasl_regexp { - char *match; /* regexp match pattern */ - char *replace; /* regexp replace pattern */ - regex_t workspace; /* workspace for regexp engine */ - regmatch_t strings[SASLREGEX_REPLACE]; /* strings matching $1,$2 ... */ - 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 - +#ifdef SLAPD_MONITOR +/* + * Operation indices + */ +enum { + SLAP_OP_BIND = 0, + SLAP_OP_UNBIND, + SLAP_OP_ADD, + SLAP_OP_DELETE, + SLAP_OP_MODRDN, + SLAP_OP_MODIFY, + SLAP_OP_COMPARE, + SLAP_OP_SEARCH, + SLAP_OP_ABANDON, + SLAP_OP_EXTENDED, + SLAP_OP_LAST +}; +#endif /* SLAPD_MONITOR */ LDAP_END_DECL