#define SLAP_MR_ORDERING 0x0200U
#define SLAP_MR_SUBSTR 0x0400U
#define SLAP_MR_EXT 0x0800U /* implicitly extensible */
-#define SLAP_MR_ORDERED_INDEX 0x1000U
+#define SLAP_MR_ORDERED_INDEX 0x1000U
#ifdef LDAP_COMP_MATCH
#define SLAP_MR_COMPONENT 0x2000U
#endif
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
struct slap_valuesreturnfilter *vrf_next;
} ValuesReturnFilter;
+#ifdef LDAP_COMP_MATCH
+typedef struct slap_component_data {
+ void* cd_mem_op;/* nibble memory handler */
+ void* cd_tree; /* component tree */
+} ComponentData;
+#endif
+
/*
* represents an attribute (description + values)
*/
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* a_component_values; /* component values */
-#endif
} Attribute;
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 */
char *be_realm;
#define LDAP_PSEARCH_BY_SCOPEOUT 0x05
#define LDAP_PSEARCH_BY_PREDELETE 0x06
-struct psid_entry {
+struct psid_entry { /* DELETE ME */
struct slap_op *ps_op;
LDAP_LIST_ENTRY(psid_entry) ps_link;
};
+#if 0 /* DELETE ME */
struct slog_entry {
struct berval sl_uuid;
struct berval sl_name;
struct berval se_spec;
LDAP_LIST_ENTRY( slap_session_entry ) se_link;
};
+#endif
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
#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;
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;
ber_int_t ca_use_def;
MatchingRule *ca_ma_rule;
struct berval ca_ma_value;
- void* ca_component_values;
+ ComponentData ca_comp_data; /* componentized assertion */
struct slap_component_filter *ca_cf;
MatchingRuleAssertion *ca_mra;
} ComponentAssertion;
char* cav_ptr;
char* cav_end;
} ComponentAssertionValue;
-/*
+
+#if 0
typedef int encoder_func LDAP_P((
void* b,
- void* comp));*/
+ void* comp));
+#endif
struct slap_component_syntax_info;
typedef int gser_decoder_func LDAP_P((
+ void* mem_op,
void* b,
struct slap_component_syntax_info** comp_syn_info,
int* len,
void* b));
typedef int ber_decoder_func LDAP_P((
+ void* mem_op,
void* b,
int tag,
int elmtLen,
int mode));
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 ));
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 int convert_assert_to_comp_func LDAP_P ((
+typedef void* convert_assert_to_comp_func LDAP_P ((
struct slap_component_syntax_info* csi_attr,
struct berval* bv,
struct slap_component_syntax_info** csi,
struct berval *bv ));
typedef void free_component_func LDAP_P ((
- struct slap_component_syntax_info* csi ));
+ void* mem_op));
+
+typedef int test_component_func LDAP_P ((
+ void* mem_op,
+ struct slap_component_syntax_info* csi,
+ struct slap_component_assertion* ca));
typedef int allcomponent_matching_func LDAP_P((
char* oid,
int cd_tag;
int cd_type;
int cd_type_id;
+ int cd_compref_type;
gser_decoder_func *cd_gser_decoder;
ber_decoder_func *cd_ber_decoder;
comp_free_func *cd_free;