X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fslap.h;h=d018a3e8365d4c4236b64690e270457922269379;hb=9ba829436e33d42f918f377a7b636869f7a9c371;hp=96f7747cdc61507b7078e96ddab5161b98aae9c7;hpb=925714ceeff035c596ad3d3c899ff631986c6757;p=openldap diff --git a/servers/slapd/slap.h b/servers/slapd/slap.h index 96f7747cdc..d018a3e836 100644 --- a/servers/slapd/slap.h +++ b/servers/slapd/slap.h @@ -215,6 +215,10 @@ typedef struct slap_ssf_set { #define SLAP_SYNTAX_ATTRIBUTETYPES_OID "1.3.6.1.4.1.1466.115.121.1.3" #define SLAP_SYNTAX_OBJECTCLASSES_OID "1.3.6.1.4.1.1466.115.121.1.37" +#ifdef LDAP_CLIENT_UPDATE +#define LCUP_COOKIE_OID "1.3.6.1.4.1.4203.666.10.1" +#endif /* LDAP_CLIENT_UPDATE */ + /* * represents schema information for a database */ @@ -224,19 +228,20 @@ typedef struct slap_ssf_set { #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_ATTR_BAD_MR 7 +#define SLAP_SCHERR_ATTR_BAD_USAGE 8 +#define SLAP_SCHERR_ATTR_BAD_SUP 9 +#define SLAP_SCHERR_ATTR_INCOMPLETE 10 +#define SLAP_SCHERR_ATTR_DUP 11 +#define SLAP_SCHERR_MR_NOT_FOUND 12 +#define SLAP_SCHERR_MR_INCOMPLETE 13 +#define SLAP_SCHERR_MR_DUP 14 +#define SLAP_SCHERR_SYN_NOT_FOUND 15 +#define SLAP_SCHERR_SYN_DUP 16 +#define SLAP_SCHERR_NO_NAME 17 +#define SLAP_SCHERR_NOT_SUPPORTED 18 +#define SLAP_SCHERR_BAD_DESCR 19 +#define SLAP_SCHERR_OIDM 20 #define SLAP_SCHERR_LAST SLAP_SCHERR_OIDM typedef union slap_sockaddr { @@ -278,7 +283,16 @@ typedef struct slap_syntax { #define ssyn_oid ssyn_syn.syn_oid #define ssyn_desc ssyn_syn.syn_desc #define ssyn_extensions ssyn_syn.syn_extensions + /* + * Note: the former ber_len_t ssyn_oidlen; + * has been replaced by a struct berval that uses the value + * provided by ssyn_syn.syn_oid; a macro that expands to + * the bv_len field of the berval is provided for backward + * compatibility. CAUTION: NEVER FREE THE BERVAL + */ + struct berval ssyn_bvoid; +#define ssyn_oidlen ssyn_bvoid.bv_len unsigned int ssyn_flags; @@ -361,9 +375,24 @@ typedef int slap_mr_filter_func LDAP_P(( void * assertValue, BerVarray *keys )); +typedef struct slap_matching_rule_use MatchingRuleUse; + typedef struct slap_matching_rule { LDAPMatchingRule smr_mrule; - ber_len_t smr_oidlen; + MatchingRuleUse *smr_mru; + /* RFC2252 string representation */ + struct berval smr_str; + /* + * Note: the former + ber_len_t smr_oidlen; + * has been replaced by a struct berval that uses the value + * provided by smr_mrule.mr_oid; a macro that expands to + * the bv_len field of the berval is provided for backward + * compatibility. CAUTION: NEVER FREE THE BERVAL + */ + struct berval smr_bvoid; +#define smr_oidlen smr_bvoid.bv_len + slap_mask_t smr_usage; #define SLAP_MR_HIDE 0x8000U @@ -376,7 +405,7 @@ typedef struct slap_matching_rule { #define SLAP_MR_EQUALITY 0x0100U #define SLAP_MR_ORDERING 0x0200U #define SLAP_MR_SUBSTR 0x0400U -#define SLAP_MR_EXT 0x0800U +#define SLAP_MR_EXT 0x0800U /* implicitly extensible */ #define SLAP_MR_EQUALITY_APPROX ( SLAP_MR_EQUALITY | 0x0010U ) #define SLAP_MR_DN_FOLD 0x0008U @@ -415,6 +444,13 @@ typedef struct slap_matching_rule { slap_mr_indexer_func *smr_indexer; slap_mr_filter_func *smr_filter; + /* + * null terminated list of syntaxes compatible with this syntax + * note: when MS_EXT is set, this MUST NOT contain the assertion + * syntax of the rule. When MS_EXT is not set, it MAY. + */ + Syntax **smr_compat_syntaxes; + struct slap_matching_rule *smr_associated; struct slap_matching_rule *smr_next; @@ -426,9 +462,27 @@ typedef struct slap_matching_rule { #define smr_extensions smr_mrule.mr_extensions } MatchingRule; +struct slap_matching_rule_use { + LDAPMatchingRuleUse smru_mruleuse; + MatchingRule *smru_mr; + /* RFC2252 string representation */ + struct berval smru_str; + + struct slap_matching_rule_use *smru_next; + +#define smru_oid smru_mruleuse.mru_oid +#define smru_names smru_mruleuse.mru_names +#define smru_desc smru_mruleuse.mru_desc +#define smru_obsolete smru_mruleuse.mru_obsolete +#define smru_applies_oids smru_mruleuse.mru_applies_oids + +#define smru_usage smru_mr->smr_usage +} /* MatchingRuleUse */ ; + typedef struct slap_mrule_defs_rec { char * mrd_desc; slap_mask_t mrd_usage; + char ** mrd_compat_syntaxes; slap_mr_convert_func * mrd_convert; slap_mr_normalize_func * mrd_normalize; slap_mr_match_func * mrd_match; @@ -505,7 +559,8 @@ typedef int (ObjectClassSchemaCheckFN)( char *textbuf, size_t textlen ); typedef struct slap_object_class { - LDAPObjectClass soc_oclass; + LDAPObjectClass soc_oclass; + struct berval soc_cname; struct slap_object_class **soc_sups; AttributeType **soc_required; AttributeType **soc_allowed; @@ -1186,7 +1241,7 @@ struct slap_backend_db { #define SLAP_RESTRICT_OP_SEARCH 0x0080U #define SLAP_RESTRICT_OP_READS \ - ( SLAP_RESTRICT_OP_COMPARE \ + ( SLAP_RESTRICT_OP_COMPARE \ | SLAP_RESTRICT_OP_SEARCH ) #define SLAP_RESTRICT_OP_WRITES \ ( SLAP_RESTRICT_OP_ADD \ @@ -1228,7 +1283,7 @@ struct slap_backend_db { 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 */ + 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 struct slap_limits_set be_def_limit; /* default limits */ @@ -1301,13 +1356,13 @@ typedef int (BI_op_abandon) LDAP_P((BackendDB *bd, ber_int_t msgid)); typedef int (BI_op_extended) LDAP_P(( - BackendDB *be, - struct slap_conn *conn, - struct slap_op *op, + BackendDB *be, + struct slap_conn *conn, + struct slap_op *op, const char *reqoid, - struct berval * reqdata, + struct berval * reqdata, char **rspoid, - struct berval ** rspdata, + struct berval ** rspdata, LDAPControl *** rspctrls, const char ** text, BerVarray *refs )); @@ -1508,6 +1563,7 @@ typedef struct slap_paged_state { 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 */ ber_int_t o_msgid; /* msgid of the request */ ber_int_t o_protocol; /* version of the LDAP protocol used by client */ @@ -1533,6 +1589,17 @@ typedef struct slap_op { ber_int_t o_pagedresults_size; PagedResultsState o_pagedresults_state; +#ifdef LDAP_CLIENT_UPDATE + char o_clientupdate; + char o_clientupdate_type; +#define SLAP_LCUP_NONE (0x0) +#define SLAP_LCUP_SYNC (0x1) +#define SLAP_LCUP_PERSIST (0x2) +#define SLAP_LCUP_SYNC_AND_PERSIST (0x3) + ber_int_t o_clientupdate_interval; + struct berval o_clientupdate_state; +#endif /* LDAP_CLIENT_UPDATE */ + #ifdef LDAP_CONNECTIONLESS Sockaddr o_peeraddr; /* UDP peer address */ #endif @@ -1619,7 +1686,6 @@ typedef struct slap_conn { 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 */ @@ -1640,7 +1706,7 @@ typedef struct slap_conn { fprintf( stderr, (fmt), (connid), (opid), (arg1), (arg2), (arg3) );\ if ( ldap_syslog & (level) ) \ syslog( ldap_syslog_level, (fmt), (connid), (opid), (arg1), \ - (arg2), (arg3) ); \ + (arg2), (arg3) ); \ } while (0) #else #define Statslog( level, fmt, connid, opid, arg1, arg2, arg3 ) @@ -1682,6 +1748,22 @@ enum { }; #endif /* SLAPD_MONITOR */ +/* + * Better know these all around slapd + */ +#define SLAP_LDAPDN_PRETTY 0x1 +#define SLAP_LDAPDN_MAXLEN 8192 + +/* + * Macros for LCUP + */ +#ifdef LDAP_CLIENT_UPDATE +#define SLAP_LCUP_STATE_UPDATE_TRUE 1 +#define SLAP_LCUP_STATE_UPDATE_FALSE 0 +#define SLAP_LCUP_ENTRY_DELETED_TRUE 1 +#define SLAP_LCUP_ENTRY_DELETED_FALSE 0 +#endif /* LDAP_CLIENT_UPDATE */ + LDAP_END_DECL #include "proto-slap.h"