X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=06decced857bd7a70f6174bbb57542bb35393f80;hb=3d9377f76404965d483c210a95e4e55386ff98a3;hp=36071a11d8ba3e15b58e570ecbfdc2ab32d5692d;hpb=61de99937fad9621c7ab1802d6b483d631ea035f;p=openldap diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 36071a11d8..06decced85 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 */ @@ -10,6 +10,7 @@ #include "ldap_defaults.h" +#include #include #include @@ -25,23 +26,40 @@ #define ldap_debug slap_debug #endif - #include "ldap_log.h" #include #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 +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 */ @@ -85,6 +102,7 @@ LDAP_BEGIN_DECL #define FILTER_ESCAPE(c) ( (c) == '*' || (c) == '\\' \ || (c) == '(' || (c) == ')' || !ASCII_PRINTABLE(c) ) +#define DN_ESCAPE(c) ((c) == SLAP_ESCAPE_CHAR) #define DN_SEPARATOR(c) ((c) == ',' || (c) == ';') #define RDN_ATTRTYPEANDVALUE_SEPARATOR(c) ((c) == '+') /* RFC 2253 */ #define RDN_SEPARATOR(c) (DN_SEPARATOR(c) || RDN_ATTRTYPEANDVALUE_SEPARATOR(c)) @@ -112,15 +130,13 @@ LDAP_BEGIN_DECL /* must match in schema_init.c */ #define SLAPD_DN_SYNTAX "1.3.6.1.4.1.1466.115.121.1.12" -#define SLAPD_NAMEUID_SYNTAX "1.3.6.1.4.1.1466.115.121.1.34" +#define SLAPD_NAMEUID_SYNTAX "1.3.6.1.4.1.1466.115.121.1.34" #define SLAPD_GROUP_ATTR "member" #define SLAPD_GROUP_CLASS "groupOfNames" #define SLAPD_ROLE_ATTR "roleOccupant" #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" */ @@ -128,7 +144,7 @@ LDAP_BEGIN_DECL #define SLAPD_TOP_OID "2.5.6.0" -LDAP_SLAPD_F (int) slap_debug; +LDAP_SLAPD_V (int) slap_debug; typedef unsigned long slap_mask_t; @@ -176,11 +192,9 @@ typedef struct slap_ssf_set { #define SLAP_INDEX_SUBSTR_MAXLEN 4 #define SLAP_INDEX_SUBSTR_STEP 2 -#define SLAP_INDEX_FLAGS 0xF000UL -#define SLAP_INDEX_SUBTYPES 0x1000UL /* use index with subtypes */ -#define SLAP_INDEX_AUTO_SUBTYPES 0x2000UL /* use mask with subtypes */ -#define SLAP_INDEX_LANG 0x4000UL /* use index with lang subtypes */ -#define SLAP_INDEX_AUTO_LANG 0x8000UL /* use mask with lang subtypes */ +#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 */ /* * there is a single index for each attribute. these prefixes ensure @@ -216,7 +230,20 @@ typedef struct slap_ssf_set { #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_BAD_DESCR 16 +#define SLAP_SCHERR_OIDM 17 +#define SLAP_SCHERR_LAST SLAP_SCHERR_OIDM + +typedef union slap_sockaddr { + struct sockaddr sa_addr; + struct sockaddr_in sa_in_addr; +#ifdef LDAP_PF_INET6 + struct sockaddr_in6 sa_in6_addr; +#endif +#ifdef LDAP_PF_LOCAL + struct sockaddr_un sa_un_addr; +#endif +} Sockaddr; typedef struct slap_oid_macro { struct berval som_oid; @@ -235,21 +262,22 @@ 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; #define ssyn_oid ssyn_syn.syn_oid #define ssyn_desc ssyn_syn.syn_desc #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; @@ -273,7 +301,7 @@ typedef struct slap_syntax { /* 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(( @@ -281,7 +309,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(( @@ -299,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, - struct berval **values, - struct berval ***keys )); + BerVarray values, + BerVarray *keys )); /* Filter index function */ typedef int slap_mr_filter_func LDAP_P(( @@ -310,13 +338,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; 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 @@ -327,13 +358,34 @@ typedef struct slap_matching_rule { #define SLAP_MR_EXT 0x0800U #define SLAP_MR_EQUALITY_APPROX ( SLAP_MR_EQUALITY | 0x0010U ) +#define SLAP_MR_DN_FOLD 0x0008U #define SLAP_MR_SUBSTR_INITIAL ( SLAP_MR_SUBSTR | 0x0010U ) #define SLAP_MR_SUBSTR_ANY ( SLAP_MR_SUBSTR | 0x0020U ) #define SLAP_MR_SUBSTR_FINAL ( SLAP_MR_SUBSTR | 0x0040U ) -/* this is used to kludge objectClass testing */ -#define SLAP_MR_MODIFY_MATCHING 0x0001U +/* + * normally the provided value is expected to conform to + * assertion syntax specified in the matching rule, however + * at times (such as during individual value modification), + * 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_IS_MR_ASSERTION_SYNTAX_MATCH( usage ) \ + (!((usage) & SLAP_MR_VALUE_SYNTAX_MATCH)) +#define SLAP_IS_MR_VALUE_SYNTAX_MATCH( usage ) \ + ((usage) & SLAP_MR_VALUE_SYNTAX_MATCH) + +#define SLAP_IS_MR_VALUE_SYNTAX_CONVERTED_MATCH( usage ) \ + (((usage) & SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH) \ + == SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH) +#define SLAP_IS_MR_VALUE_SYNTAX_NONCONVERTED_MATCH( usage ) \ + (((usage) & SLAP_MR_VALUE_SYNTAX_CONVERTED_MATCH) \ + == SLAP_MR_VALUE_SYNTAX_MATCH) Syntax *smr_syntax; slap_mr_convert_func *smr_convert; @@ -353,22 +405,38 @@ typedef struct slap_matching_rule { #define smr_extensions smr_mrule.mr_extensions } MatchingRule; +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 { - char *sat_cname; LDAPAttributeType sat_atype; + struct berval sat_cname; struct slap_attribute_type *sat_sup; struct slap_attribute_type **sat_subtypes; MatchingRule *sat_equality; MatchingRule *sat_approx; MatchingRule *sat_ordering; MatchingRule *sat_substr; - Syntax *sat_syntax; + Syntax *sat_syntax; + + AttributeTypeSchemaCheckFN *sat_check; + slap_mask_t sat_flags; + 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 @@ -376,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) @@ -386,37 +457,77 @@ 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 *sco_check; + 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 ) */ typedef struct slap_attr_desc { - struct berval *ad_cname; /* canonical name, must be specified */ + struct slap_attr_desc *ad_next; AttributeType *ad_type; /* attribute type, must be specified */ - char *ad_lang; /* NULL if no language tags */ + 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 } AttributeDescription; -#define slap_ad_is_lang(ad) ( (ad)->ad_lang != NULL ) +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_binary(ad) ( (int)((ad)->ad_flags & SLAP_DESC_BINARY) ? 1 : 0 ) /* @@ -428,9 +539,12 @@ 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_collectiveAttributes; + ObjectClass *si_oc_dynamicObject; /* objectClass attribute descriptions */ AttributeDescription *si_ad_objectClass; @@ -441,22 +555,37 @@ struct slap_internal_schema { AttributeDescription *si_ad_createTimestamp; AttributeDescription *si_ad_modifiersName; AttributeDescription *si_ad_modifyTimestamp; + AttributeDescription *si_ad_hasSubordinates; AttributeDescription *si_ad_subschemaSubentry; + AttributeDescription *si_ad_collectiveSubentry; + 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_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; @@ -469,38 +598,54 @@ struct slap_internal_schema { 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 /* Undefined Attribute Type */ AttributeType *si_at_undefined; + + /* Matching Rules */ + MatchingRule *si_mr_distinguishedNameMatch; + MatchingRule *si_mr_integerMatch; + + /* Syntaxes */ + 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 */ - char *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; - /* * represents a search filter */ @@ -510,13 +655,12 @@ typedef struct slap_filter { #define SLAPD_FILTER_DN_ONE ((ber_tag_t) -2) #define SLAPD_FILTER_DN_SUBTREE ((ber_tag_t) -3) - union f_un_u { /* precomputed result */ ber_int_t f_un_result; /* DN */ - char *f_un_dn; + struct berval *f_un_dn; /* present */ AttributeDescription *f_un_desc; @@ -568,8 +712,11 @@ typedef struct slap_filter { */ 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; @@ -590,8 +737,13 @@ typedef struct slap_entry { */ ID e_id; - char *e_dn; /* DN of this entry */ - char *e_ndn; /* normalized DN of this entry */ + struct berval e_name; /* name (DN) of this entry */ + struct berval e_nname; /* normalized name (DN) of this entry */ + + /* for migration purposes */ +#define e_dn e_name.bv_val +#define e_ndn e_nname.bv_val + Attribute *e_attrs; /* list of attributes + values */ /* for use by the backend for any purpose */ @@ -604,13 +756,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; @@ -659,8 +813,8 @@ typedef enum slap_style_e { typedef struct slap_authz_info { ber_tag_t sai_method; /* LDAP_AUTH_* from */ char * sai_mech; /* SASL Mechanism */ - char * sai_dn; /* DN for reporting purposes */ - char * sai_ndn; /* Normalized DN */ + struct berval sai_dn; /* DN for reporting purposes */ + struct berval sai_ndn; /* Normalized DN */ /* Security Strength Factors */ slap_ssf_t sai_ssf; /* Overall SSF */ @@ -749,7 +903,7 @@ typedef struct slap_access { slap_style_t a_sockurl_style; char *a_sockurl_pat; slap_style_t a_set_style; - char *a_set_pat; + struct berval a_set_pat; #ifdef SLAPD_ACI_ENABLED AttributeDescription *a_aci_at; @@ -757,7 +911,7 @@ typedef struct slap_access { /* ACL Groups */ slap_style_t a_group_style; - char *a_group_pat; + struct berval a_group_pat; ObjectClass *a_group_oc; AttributeDescription *a_group_at; @@ -770,8 +924,8 @@ typedef struct slap_acl { Filter *acl_filter; slap_style_t acl_dn_style; regex_t acl_dn_re; - char *acl_dn_pat; - char **acl_attrs; + struct berval acl_dn_pat; + AttributeName *acl_attrs; /* "by" part: list of who has what access to the entries */ Access *acl_access; @@ -782,10 +936,10 @@ typedef struct slap_acl { /* * replog moddn param structure */ -struct replog_moddn { - char *newrdn; +struct slap_replog_moddn { + struct berval *newrdn; int deloldrdn; - char *newsup; + struct berval *newsup; }; /* @@ -796,12 +950,12 @@ struct replog_moddn { typedef struct slap_backend_info BackendInfo; /* per backend type */ typedef struct slap_backend_db BackendDB; /* per backend database */ -LDAP_SLAPD_F (int) nBackendInfo; -LDAP_SLAPD_F (int) nBackendDB; -LDAP_SLAPD_F (BackendInfo *) backendInfo; -LDAP_SLAPD_F (BackendDB *) backendDB; +LDAP_SLAPD_V (int) nBackendInfo; +LDAP_SLAPD_V (int) nBackendDB; +LDAP_SLAPD_V (BackendInfo *) backendInfo; +LDAP_SLAPD_V (BackendDB *) backendDB; -LDAP_SLAPD_F (int) slapMode; +LDAP_SLAPD_V (int) slapMode; #define SLAP_UNDEFINED_MODE 0x0000 #define SLAP_SERVER_MODE 0x0001 #define SLAP_TOOL_MODE 0x0002 @@ -810,8 +964,8 @@ LDAP_SLAPD_F (int) slapMode; #define SLAP_TRUNCATE_MODE 0x0100 struct slap_replica_info { - char *ri_host; /* supersedes be_replica */ - char **ri_nsuffix; /* array of suffixes this replica accepts */ + char *ri_host; /* supersedes be_replica */ + struct berval **ri_nsuffix; /* array of suffixes this replica accepts */ }; struct slap_limits_set { @@ -829,9 +983,21 @@ struct slap_limits { int lm_type; /* type of pattern */ #define SLAP_LIMITS_UNDEFINED 0x0000 #define SLAP_LIMITS_EXACT 0x0001 -#define SLAP_LIMITS_REGEX 0x0002 - regex_t lm_dn_regex; /* regex-based size and time limits */ - char *lm_dn_pat; /* ndn for EXACT; pattern for REGEX */ +#define SLAP_LIMITS_BASE SLAP_LIMITS_EXACT +#define SLAP_LIMITS_ONE 0x0002 +#define SLAP_LIMITS_SUBTREE 0x0003 +#define SLAP_LIMITS_CHILDREN 0x0004 +#define SLAP_LIMITS_REGEX 0x0005 +#define SLAP_LIMITS_ANONYMOUS 0x0006 +#define SLAP_LIMITS_USERS 0x0007 + 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 slap_limits_set lm_limits; }; @@ -862,6 +1028,7 @@ struct slap_backend_db { #define be_chk_referrals bd_info->bi_chk_referrals #define be_group bd_info->bi_acl_group #define be_attribute bd_info->bi_acl_attribute +#define be_operational bd_info->bi_operational #define be_controls bd_info->bi_controls @@ -879,6 +1046,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 @@ -898,19 +1082,16 @@ struct slap_backend_db { | SLAP_RESTRICT_OP_MODIFY \ | SLAP_RESTRICT_OP_RENAME ) -#define SLAP_ALLOW_TLS_2_ANON 0x0001U /* StartTLS -> Anonymous */ +#define SLAP_ALLOW_BIND_V2 0x0001U /* LDAPv2 bind */ +#define SLAP_ALLOW_BIND_ANON_CRED 0x0002U /* cred should be empty */ +#define SLAP_ALLOW_BIND_ANON_DN 0x0003U /* dn should be empty */ -#define SLAP_DISALLOW_BIND_V2 0x0001U /* LDAPv2 bind */ -#define SLAP_DISALLOW_BIND_ANON 0x0002U /* no anonymous */ -#define SLAP_DISALLOW_BIND_ANON_CRED \ - 0x0004U /* cred should be empty */ -#define SLAP_DISALLOW_BIND_ANON_DN \ - 0x0008U /* dn should be empty */ +#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 0x0010U /* simple authentication */ -#define SLAP_DISALLOW_BIND_KRBV4 0x0020U /* Kerberos V4 authentication */ - -#define SLAP_DISALLOW_TLS_AUTHC 0x0100U /* TLS while authenticated */ +#define SLAP_DISALLOW_TLS_2_ANON 0x0010U /* StartTLS -> Anonymous */ +#define SLAP_DISALLOW_TLS_AUTHC 0x0020U /* TLS while authenticated */ slap_mask_t be_requires; /* pre-operation requirements */ #define SLAP_REQUIRE_BIND 0x0001U /* bind before op */ @@ -923,12 +1104,12 @@ struct slap_backend_db { slap_ssf_set_t be_ssf_set; /* these should be renamed from be_ to bd_ */ - char **be_suffix; /* the DN suffixes of data in this backend */ - char **be_nsuffix; /* the normalized DN suffixes in this backend */ - char **be_suffixAlias; /* pairs of DN suffix aliases and deref values */ - char *be_root_dn; /* the magic "root" dn for this db */ - char *be_root_ndn; /* the magic "root" normalized dn for this db */ - struct berval be_root_pw; /* the magic "root" password for this db */ + 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 */ + 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 */ unsigned int be_max_deref_depth; /* limit for depth of an alias deref */ #define be_sizelimit be_def_limit.lms_s_soft #define be_timelimit be_def_limit.lms_t_soft @@ -938,10 +1119,8 @@ struct slap_backend_db { slap_access_t be_dfltaccess; /* access given if no acl matches */ struct slap_replica_info **be_replica; /* replicas of this backend (in master) */ char *be_replogfile; /* replication log file (in master) */ - char *be_update_ndn; /* allowed to make changes (in replicas) */ - struct berval **be_update_refs; /* where to refer modifying clients to */ - int be_lastmod; /* keep track of lastmodified{by,time} */ - + struct berval be_update_ndn; /* allowed to make changes (in replicas) */ + BerVarray be_update_refs; /* where to refer modifying clients to */ char *be_realm; void *be_private; /* anything the backend database needs */ @@ -950,7 +1129,61 @@ struct slap_backend_db { struct slap_conn; struct slap_op; -typedef int (*SLAP_EXTENDED_FN) LDAP_P(( +/* Backend function typedefs */ +typedef int (BI_init) LDAP_P((BackendInfo *bi)); +typedef int (BI_config) LDAP_P((BackendInfo *bi, + const char *fname, int lineno, + int argc, char **argv)); +typedef int (BI_open) LDAP_P((BackendInfo *bi)); +typedef int (BI_close) LDAP_P((BackendInfo *bi)); +typedef int (BI_destroy) LDAP_P((BackendInfo *bi)); + +typedef int (BI_db_init) LDAP_P((Backend *bd)); +typedef int (BI_db_config) LDAP_P((Backend *bd, + const char *fname, int lineno, + int argc, char **argv)); +typedef int (BI_db_open) LDAP_P((Backend *bd)); +typedef int (BI_db_close) LDAP_P((Backend *bd)); +typedef int (BI_db_destroy) LDAP_P((Backend *bd)); + +typedef int (BI_op_bind) LDAP_P(( BackendDB *bd, + struct slap_conn *c, struct slap_op *o, + struct berval *dn, struct berval *ndn, int method, + struct berval *cred, struct berval *edn )); +typedef int (BI_op_unbind) LDAP_P((BackendDB *bd, + struct slap_conn *c, struct slap_op *o )); +typedef int (BI_op_search) LDAP_P((BackendDB *bd, + struct slap_conn *c, struct slap_op *o, + struct berval *base, struct berval *nbase, + int scope, int deref, + int slimit, int tlimit, + 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, + AttributeAssertion *ava)); +typedef int (BI_op_modify) LDAP_P((BackendDB *bd, + struct slap_conn *c, struct slap_op *o, + struct berval *dn, struct berval *ndn, + Modifications *m)); +typedef int (BI_op_modrdn) LDAP_P((BackendDB *bd, + struct slap_conn *c, struct slap_op *o, + struct berval *dn, struct berval *ndn, + struct berval *newrdn, struct berval *nnewrdn, + int deleteoldrdn, + struct berval *newSup, struct berval *nnewSup )); +typedef int (BI_op_add) LDAP_P((BackendDB *bd, + struct slap_conn *c, struct slap_op *o, + Entry *e)); +typedef int (BI_op_delete) LDAP_P((BackendDB *bd, + struct slap_conn *c, struct slap_op *o, + struct berval *dn, struct berval *ndn)); +typedef int (BI_op_abandon) LDAP_P((BackendDB *bd, + struct slap_conn *c, struct slap_op *o, + ber_int_t msgid)); + +typedef int (BI_op_extended) LDAP_P(( BackendDB *be, struct slap_conn *conn, struct slap_op *op, @@ -960,10 +1193,52 @@ typedef int (*SLAP_EXTENDED_FN) 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, + Entry *e, int rw)); + +typedef int (BI_chk_referrals) LDAP_P((BackendDB *bd, + struct slap_conn *c, struct slap_op *o, + struct berval *dn, struct berval *ndn, + const char **text )); + +typedef int (BI_acl_group) LDAP_P((Backend *bd, + struct slap_conn *c, struct slap_op *o, + Entry *e, + struct berval *bdn, + struct berval *edn, + ObjectClass *group_oc, + AttributeDescription *group_at )); + +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, + BerVarray *vals )); + +typedef int (BI_operational) LDAP_P((Backend *bd, + struct slap_conn *c, struct slap_op *o, + Entry *e, AttributeName *attrs, int opattrs, Attribute **a )); + +typedef int (BI_connection_init) LDAP_P((BackendDB *bd, + struct slap_conn *c)); +typedef int (BI_connection_destroy) LDAP_P((BackendDB *bd, + struct slap_conn *c)); + +typedef int (BI_tool_entry_open) LDAP_P(( BackendDB *be, int mode )); +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, + 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: @@ -985,12 +1260,11 @@ struct slap_backend_info { * once during shutdown after all bi_db_destroy calls. * bi_destory() is called from backend_destroy() */ - int (*bi_init) LDAP_P((BackendInfo *bi)); - int (*bi_config) LDAP_P((BackendInfo *bi, - const char *fname, int lineno, int argc, char **argv )); - int (*bi_open) LDAP_P((BackendInfo *bi)); - int (*bi_close) LDAP_P((BackendInfo *bi)); - int (*bi_destroy) LDAP_P((BackendInfo *bi)); + BI_init *bi_init; + BI_config *bi_config; + BI_open *bi_open; + BI_close *bi_close; + BI_destroy *bi_destroy; /* * per database routines: @@ -1013,87 +1287,47 @@ struct slap_backend_info { * bi_close calls but before bi_destory calls. * called only by backend_destory() */ - int (*bi_db_init) LDAP_P((Backend *bd)); - int (*bi_db_config) LDAP_P((Backend *bd, - const char *fname, int lineno, int argc, char **argv )); - int (*bi_db_open) LDAP_P((Backend *bd)); - int (*bi_db_close) LDAP_P((Backend *bd)); - int (*bi_db_destroy) LDAP_P((Backend *db)); + BI_db_init *bi_db_init; + BI_db_config *bi_db_config; + BI_db_open *bi_db_open; + BI_db_close *bi_db_close; + BI_db_destroy *bi_db_destroy; /* LDAP Operations Handling Routines */ - int (*bi_op_bind) LDAP_P(( BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - const char *dn, const char *ndn, int method, - struct berval *cred, char** edn )); - int (*bi_op_unbind) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o )); - int (*bi_op_search) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - const char *base, const char *nbase, - int scope, int deref, - int slimit, int tlimit, - Filter *f, const char *filterstr, - char **attrs, int attrsonly)); - int (*bi_op_compare)LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - const char *dn, const char *ndn, - AttributeAssertion *ava)); - int (*bi_op_modify) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - const char *dn, const char *ndn, Modifications *m)); - int (*bi_op_modrdn) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - const char *dn, const char *ndn, - const char *newrdn, int deleteoldrdn, - const char *newSuperior)); - int (*bi_op_add) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - Entry *e)); - int (*bi_op_delete) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - const char *dn, const char *ndn)); - int (*bi_op_abandon) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - ber_int_t msgid)); + BI_op_bind *bi_op_bind; + BI_op_unbind *bi_op_unbind; + BI_op_search *bi_op_search; + BI_op_compare *bi_op_compare; + BI_op_modify *bi_op_modify; + BI_op_modrdn *bi_op_modrdn; + BI_op_add *bi_op_add; + BI_op_delete *bi_op_delete; + BI_op_abandon *bi_op_abandon; /* Extended Operations Helper */ - SLAP_EXTENDED_FN bi_extended; + BI_op_extended *bi_extended; /* Auxilary Functions */ - int (*bi_entry_release_rw) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - Entry *e, int rw)); + BI_entry_release_rw *bi_entry_release_rw; + BI_chk_referrals *bi_chk_referrals; - int (*bi_chk_referrals) LDAP_P((BackendDB *bd, - struct slap_conn *c, struct slap_op *o, - const char *dn, const char *ndn, - const char **text )); + BI_acl_group *bi_acl_group; + BI_acl_attribute *bi_acl_attribute; - int (*bi_acl_group) LDAP_P((Backend *bd, - struct slap_conn *c, struct slap_op *o, - Entry *e, const char *bdn, const char *edn, - ObjectClass *group_oc, - AttributeDescription *group_at )); - int (*bi_acl_attribute) LDAP_P((Backend *bd, - struct slap_conn *c, struct slap_op *o, - Entry *e, const char *edn, - AttributeDescription *entry_at, - struct berval ***vals )); + BI_operational *bi_operational; - int (*bi_connection_init) LDAP_P((BackendDB *bd, - struct slap_conn *c)); - int (*bi_connection_destroy) LDAP_P((BackendDB *bd, - struct slap_conn *c)); + BI_connection_init *bi_connection_init; + BI_connection_destroy *bi_connection_destroy; /* hooks for slap tools */ - int (*bi_tool_entry_open) LDAP_P(( BackendDB *be, int mode )); - int (*bi_tool_entry_close) LDAP_P(( BackendDB *be )); - ID (*bi_tool_entry_first) LDAP_P(( BackendDB *be )); - ID (*bi_tool_entry_next) LDAP_P(( BackendDB *be )); - Entry* (*bi_tool_entry_get) LDAP_P(( BackendDB *be, ID id )); - ID (*bi_tool_entry_put) LDAP_P(( BackendDB *be, Entry *e )); - int (*bi_tool_entry_reindex) LDAP_P(( BackendDB *be, ID id )); - int (*bi_tool_sync) LDAP_P(( BackendDB *be )); + BI_tool_entry_open *bi_tool_entry_open; + BI_tool_entry_close *bi_tool_entry_close; + BI_tool_entry_first *bi_tool_entry_first; + BI_tool_entry_next *bi_tool_entry_next; + BI_tool_entry_get *bi_tool_entry_get; + BI_tool_entry_put *bi_tool_entry_put; + BI_tool_entry_reindex *bi_tool_entry_reindex; + BI_tool_sync *bi_tool_sync; #define SLAP_INDEX_ADD_OP 0x0001 #define SLAP_INDEX_DELETE_OP 0x0002 @@ -1107,6 +1341,7 @@ struct slap_backend_info { #define c_authtype c_authz.sai_method #define c_authmech c_authz.sai_mech #define c_dn c_authz.sai_dn +#define c_ndn c_authz.sai_ndn #define c_ssf c_authz.sai_ssf #define c_transport_ssf c_authz.sai_transport_ssf #define c_tls_ssf c_authz.sai_tls_ssf @@ -1121,35 +1356,78 @@ struct slap_backend_info { #define o_tls_ssf o_authz.sai_tls_ssf #define o_sasl_ssf o_authz.sai_sasl_ssf +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 *, + struct berval *, LDAPControl ** ); + +typedef void (slap_sresult)( struct slap_conn *, struct slap_op *, + 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 */ - + 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 */ + unsigned long o_connid; /* id of conn initiating this op */ ldap_pvt_thread_t o_tid; /* thread handling this op */ - BerElement *o_ber; /* ber of the request */ +#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; - ber_tag_t o_tag; /* tag of the request */ - time_t o_time; /* time op was initiated */ + 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; - ber_int_t o_protocol; /* version of the LDAP protocol used by client */ - + BerElement *o_ber; /* ber of the request */ + slap_callback *o_callback; /* callback pointers */ LDAPControl **o_ctrls; /* controls */ - unsigned long o_connid; /* id of conn initiating this op */ + void *o_private; /* anything the backend needs */ - ldap_pvt_thread_mutex_t o_abandonmutex; /* protects o_abandon */ - int o_abandon; /* abandon flag */ - - struct slap_op *o_next; /* next operation in list */ - 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) +#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]; +} GroupAssertion; + /* * represents a connection from an ldap client */ @@ -1173,7 +1451,7 @@ typedef struct slap_conn { /* 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_cdn; /* authentication backend */ Backend *c_authc_backend; @@ -1182,11 +1460,12 @@ typedef struct slap_conn { Backend *c_authz_backend; AuthorizationInformation c_authz; + GroupAssertion *c_groups; 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*/ @@ -1194,6 +1473,9 @@ typedef struct slap_conn { BerElement *c_currentber; /* ber we're attempting to read */ int c_writewaiter; /* true if writer is waiting */ +#ifdef LDAP_CONNECTIONLESS + int c_is_udp; /* true if this is (C)LDAP over UDP */ +#endif #ifdef HAVE_TLS int c_is_tls; /* true if this LDAP over raw TLS */ int c_needs_tls_accept; /* true if SSL_accept should be called */ @@ -1238,11 +1520,22 @@ 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 + */ +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; LDAP_END_DECL