/* search.c - search operation */
/* $OpenLDAP$ */
-/*
- * Copyright 1998-2003 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2000-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
*/
#include "portable.h"
BackendDB *be,
Entry *e,
ID *ids );
+
static int search_candidates(
Operation *stackop, /* op with the current threadctx/slab cache */
Operation *sop, /* search op */
u_int32_t locker,
ID *ids,
ID *scopes );
+
static void send_pagerequest_response(
Operation *op,
SlapReply *rs,
rs->sr_text = "maximum deref depth exceeded";
while (BDB_IDL_N(tmp) < op->o_bd->be_max_deref_depth) {
-
/* Remember the last entry we looked at, so we can
* report broken links
*/
rs->sr_err = bdb_dn2entry( op, NULL, &ndn, &ei,
0, locker, &lockr );
- if ( ei ) e = ei->bei_e;
- else e = NULL;
+ if ( ei ) {
+ e = ei->bei_e;
+ } else {
+ e = NULL;
+ }
if (!e) {
rs->sr_err = LDAP_ALIAS_PROBLEM;
u_int32_t locker,
ID *ids,
ID *scopes,
- ID *stack
-)
+ ID *stack )
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
ID *aliases, *curscop, *subscop, *visited, *newsubs, *oldsubs, *tmp;
*/
BDB_IDL_CPY( curscop, aliases );
rs->sr_err = bdb_dn2idl( op, e, subscop,
- subscop2+BDB_IDL_DB_SIZE );
+ subscop2+BDB_IDL_DB_SIZE );
if (first) {
first = 0;
} else {
/* If this is a OneLevel search, we're done; oldsubs only had one
* ID in it. For a Subtree search, oldsubs may be a list of scope IDs.
*/
- if (op->ors_scope != LDAP_SCOPE_SUBTREE) break;
+ if ( op->ors_scope == LDAP_SCOPE_ONELEVEL ) break;
nextido:
ido = bdb_idl_next( oldsubs, &cursoro );
ei = NULL;
rs->sr_err = bdb_cache_find_id(op, NULL, ido, &ei,
0, locker, &locka );
- if (rs->sr_err != LDAP_SUCCESS) goto nextido;
+ if ( rs->sr_err != LDAP_SUCCESS ) goto nextido;
e = ei->bei_e;
}
return rs->sr_err;
}
-static
-int is_sync_protocol( Operation *op )
-{
-#if !defined(LDAP_CLIENT_UPDATE) && !defined(LDAP_SYNC)
- return 0;
-#endif
+#define is_sync_protocol(op) \
+ ((op)->o_sync_mode & SLAP_SYNC_REFRESH_AND_PERSIST)
-#ifdef LDAP_CLIENT_UPDATE
- if ( op->o_clientupdate_type & SLAP_LCUP_SYNC_AND_PERSIST )
- return 1;
-#endif
-#ifdef LDAP_SYNC
- if ( op->o_sync_mode & SLAP_SYNC_REFRESH_AND_PERSIST )
- return 1;
-#endif
- return 0;
-}
-
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
#define IS_BDB_REPLACE(type) (( type == LDAP_PSEARCH_BY_DELETE ) || \
( type == LDAP_PSEARCH_BY_SCOPEOUT ))
#define IS_PSEARCH (op != sop)
-int
-bdb_abandon( Operation *op, SlapReply *rs )
+static Operation *
+bdb_drop_psearch( Operation *op, ber_int_t msgid )
{
Operation *ps_list;
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
if ( ps_list->o_connid == op->o_connid ) {
- if ( ps_list->o_msgid == op->oq_abandon.rs_msgid ) {
+ if ( ps_list->o_msgid == msgid ) {
ps_list->o_abandon = 1;
LDAP_LIST_REMOVE( ps_list, o_ps_link );
- slap_op_free ( ps_list );
- return LDAP_SUCCESS;
+ ldap_pvt_thread_mutex_lock( &op->o_conn->c_mutex );
+ LDAP_STAILQ_REMOVE( &op->o_conn->c_ops, ps_list,
+ slap_op, o_next );
+ LDAP_STAILQ_NEXT( ps_list, o_next ) = NULL;
+ op->o_conn->c_n_ops_executing--;
+ op->o_conn->c_n_ops_completed++;
+ ldap_pvt_thread_mutex_unlock( &op->o_conn->c_mutex );
+ return ps_list;
}
}
}
- return LDAP_UNAVAILABLE;
+
+ return NULL;
}
int
-bdb_cancel( Operation *op, SlapReply *rs )
+bdb_abandon( Operation *op, SlapReply *rs )
{
- Operation *ps_list;
- struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+ Operation *ps;
- LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
- if ( ps_list->o_connid == op->o_connid ) {
- if ( ps_list->o_msgid == op->oq_cancel.rs_msgid ) {
- ps_list->o_cancel = SLAP_CANCEL_DONE;
- LDAP_LIST_REMOVE( ps_list, o_ps_link );
-
-#if 0
- bdb_build_sync_done_ctrl( conn, ps_list, ps_list->ctrls,
- 1, &latest_entrycsn_bv );
- send_ldap_result( conn, ps_list, LDAP_CANCELLED,
- NULL, NULL, NULL, ps_list->ctrls, ps_list->nentries);
-#endif
- rs->sr_err = LDAP_CANCELLED;
- send_ldap_result( ps_list, rs );
-
- if ( ps_list->o_tmpmemctx ) {
- sl_mem_destroy( NULL, ps_list->o_tmpmemctx );
- }
+ ps = bdb_drop_psearch( op, op->oq_abandon.rs_msgid );
+ if ( ps ) {
+ if ( ps->o_tmpmemctx ) {
+ slap_sl_mem_destroy( NULL, ps->o_tmpmemctx );
+ }
+ slap_op_free ( ps );
+ return LDAP_SUCCESS;
+ }
+ return LDAP_UNAVAILABLE;
+}
- slap_op_free ( ps_list );
- return LDAP_SUCCESS;
- }
+int
+bdb_cancel( Operation *op, SlapReply *rs )
+{
+ Operation *ps;
+
+ ps = bdb_drop_psearch( op, op->oq_cancel.rs_msgid );
+ if ( ps ) {
+ rs->sr_err = LDAP_CANCELLED;
+ send_ldap_result( ps, rs );
+ if ( ps->o_tmpmemctx ) {
+ slap_sl_mem_destroy( NULL, ps->o_tmpmemctx );
}
+ slap_op_free ( ps );
+ return LDAP_SUCCESS;
}
return LDAP_UNAVAILABLE;
}
int
bdb_do_search( Operation *op, SlapReply *rs, Operation *sop,
Entry *ps_e, int ps_type )
-#else
-#define IS_PSEARCH 0
-#define sop op
-int bdb_search( Operation *op, SlapReply *rs )
-#endif
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
time_t stoptime;
ID id, cursor;
ID candidates[BDB_IDL_UM_SIZE];
ID scopes[BDB_IDL_DB_SIZE];
- Entry *e = NULL, base;
- Entry *matched = NULL;
- EntryInfo *ei;
- struct berval realbase = { 0, NULL };
+ Entry *e = NULL, base, e_root = {0};
+ Entry *matched = NULL;
+ EntryInfo *ei, ei_root = {0};
+ struct berval realbase = BER_BVNULL;
int manageDSAit;
int tentries = 0;
ID lastid = NOID;
AttributeName *attrs;
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
- Filter cookief, csnfnot, csnfeq, csnfand, csnfge;
- AttributeAssertion aa_ge, aa_eq;
- int entry_count = 0;
-#if 0
- struct berval entrycsn_bv = { 0, NULL };
-#endif
- struct berval latest_entrycsn_bv = { 0, NULL };
- LDAPControl *ctrls[SLAP_SEARCH_MAX_CTRLS];
+ Filter contextcsnand, contextcsnle, cookief, csnfnot,
+ csnfeq, csnfand, csnfge;
+ AttributeAssertion aa_ge, aa_eq, aa_le;
+ struct berval *search_context_csn = NULL;
+ DB_LOCK ctxcsn_lock;
+ LDAPControl *ctrls[SLAP_MAX_RESPONSE_CONTROLS];
int num_ctrls = 0;
AttributeName uuid_attr[2];
-#ifdef LDAP_SYNC
int rc_sync = 0;
int entry_sync_state = -1;
AttributeName null_attr;
-#endif
-#endif
- struct slap_limits_set *limit = NULL;
- int isroot = 0;
+ int no_sync_state_change = 0;
u_int32_t locker = 0;
DB_LOCK lock;
+ Operation *ps_list;
+ int sync_send_present_mode = 1;
+ int match;
+ MatchingRule *mr;
+ const char *text;
+ int slog_found = 0;
+
+ BerVarray syncUUID_set = NULL;
+ int syncUUID_set_cnt = 0;
+
#ifdef NEW_LOGGING
- LDAP_LOG( OPERATION, ENTRY, "bdb_back_search\n", 0, 0, 0 );
+ LDAP_LOG( OPERATION, ENTRY, "bdb_search\n", 0, 0, 0 );
#else
- Debug( LDAP_DEBUG_TRACE, "=> bdb_back_search\n",
+ Debug( LDAP_DEBUG_TRACE, "=> bdb_search\n",
0, 0, 0);
#endif
attrs = sop->oq_search.rs_attrs;
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
-#ifdef LDAP_CLIENT_UPDATE
- if ( !IS_PSEARCH && sop->o_clientupdate_type & SLAP_LCUP_PERSIST ) {
- sop->o_ps_protocol = LDAP_CLIENT_UPDATE;
- LDAP_LIST_INSERT_HEAD( &bdb->bi_psearch_list, sop, o_ps_link );
- return LDAP_SUCCESS;
+ if ( !IS_PSEARCH && sop->o_sync_mode & SLAP_SYNC_REFRESH_AND_PERSIST ) {
+ struct slap_session_entry *sent;
+ if ( sop->o_sync_state.sid >= 0 ) {
+ LDAP_LIST_FOREACH( sent, &bdb->bi_session_list, se_link ) {
+ if ( sent->se_id == sop->o_sync_state.sid ) {
+ sop->o_sync_slog_size = sent->se_size;
+ break;
+ }
+ }
+ }
}
-#endif
-#ifdef LDAP_SYNC
+
/* psearch needs to be registered before refresh begins */
/* psearch and refresh transmission is serialized in send_ldap_ber() */
if ( !IS_PSEARCH && sop->o_sync_mode & SLAP_SYNC_PERSIST ) {
- sop->o_ps_protocol = LDAP_SYNC;
+ ldap_pvt_thread_rdwr_wlock( &bdb->bi_pslist_rwlock );
LDAP_LIST_INSERT_HEAD( &bdb->bi_psearch_list, sop, o_ps_link );
+ ldap_pvt_thread_rdwr_wunlock( &bdb->bi_pslist_rwlock );
+
+ } else if ( !IS_PSEARCH && sop->o_sync_mode & SLAP_SYNC_REFRESH_AND_PERSIST
+ && sop->o_sync_slog_size >= 0 )
+ {
+ ldap_pvt_thread_rdwr_wlock( &bdb->bi_pslist_rwlock );
+ LDAP_LIST_FOREACH( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
+ if ( ps_list->o_sync_slog_size >= 0 ) {
+ if ( ps_list->o_sync_state.sid == sop->o_sync_state.sid ) {
+ slog_found = 1;
+ break;
+ }
+ }
+ }
+
+ if ( slog_found ) {
+ if ( ps_list->o_sync_slog_omitcsn.bv_len != 0 ) {
+ mr = slap_schema.si_ad_entryCSN->ad_type->sat_ordering;
+ if ( sop->o_sync_state.ctxcsn &&
+ sop->o_sync_state.ctxcsn->bv_val != NULL )
+ {
+ value_match( &match, slap_schema.si_ad_entryCSN, mr,
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ sop->o_sync_state.ctxcsn,
+ &ps_list->o_sync_slog_omitcsn,
+ &text );
+ } else {
+ match = -1;
+ }
+ if ( match >= 0 ) {
+ sync_send_present_mode = 0;
+ }
+ } else {
+ sync_send_present_mode = 0;
+ }
+ } else if ( sop->o_sync_slog_size >= 0 ) {
+ LDAP_LIST_INSERT_HEAD( &bdb->bi_psearch_list, sop, o_ps_link );
+ } else {
+ sop->o_sync_state.sid = -1;
+ }
+ ldap_pvt_thread_rdwr_wunlock( &bdb->bi_pslist_rwlock );
}
+
null_attr.an_desc = NULL;
null_attr.an_oc = NULL;
+ null_attr.an_oc_exclude = 0;
null_attr.an_name.bv_len = 0;
null_attr.an_name.bv_val = NULL;
-#endif
- for ( num_ctrls = 0; num_ctrls < SLAP_SEARCH_MAX_CTRLS; num_ctrls++ ) {
+ for( num_ctrls = 0; num_ctrls < SLAP_MAX_RESPONSE_CONTROLS; num_ctrls++ ) {
ctrls[num_ctrls] = NULL;
}
num_ctrls = 0;
if ( IS_PSEARCH && IS_BDB_REPLACE(ps_type)) {
-#ifdef LDAP_CLIENT_UPDATE
- if ( sop->o_ps_protocol == LDAP_CLIENT_UPDATE ) {
- attrs = uuid_attr;
- attrs[0].an_desc = slap_schema.si_ad_entryUUID;
- attrs[0].an_oc = NULL;
- attrs[0].an_name = attrs[0].an_desc->ad_cname;
- attrs[1].an_desc = NULL;
- attrs[1].an_oc = NULL;
- attrs[1].an_name.bv_len = 0;
- attrs[1].an_name.bv_val = NULL;
- } else
-#endif
-#ifdef LDAP_SYNC
- if (sop->o_ps_protocol == LDAP_SYNC ) {
- attrs = uuid_attr;
- attrs[0].an_desc = NULL;
- attrs[0].an_oc = NULL;
- attrs[0].an_name.bv_len = 0;
- attrs[0].an_name.bv_val = NULL;
- } else
-#endif
- {
- rs->sr_err = 1;
- goto done;
- }
+ attrs = uuid_attr;
+ attrs[0].an_desc = NULL;
+ attrs[0].an_oc = NULL;
+ attrs[0].an_oc_exclude = 0;
+ attrs[0].an_name.bv_len = 0;
+ attrs[0].an_name.bv_val = NULL;
}
-#endif
manageDSAit = get_manageDSAit( sop );
- /* Sync / LCUP controls override manageDSAit */
-
-#ifdef LDAP_CLIENT_UPDATE
- if ( !IS_PSEARCH && sop->o_clientupdate_type & SLAP_LCUP_SYNC ) {
- if ( manageDSAit == SLAP_NO_CONTROL )
- manageDSAit = SLAP_CRITICAL_CONTROL;
- } else
-#endif
-#ifdef LDAP_SYNC
+ /* Sync control overrides manageDSAit */
if ( !IS_PSEARCH && sop->o_sync_mode & SLAP_SYNC_REFRESH ) {
- if ( manageDSAit == SLAP_NO_CONTROL )
+ if ( manageDSAit == SLAP_NO_CONTROL ) {
manageDSAit = SLAP_CRITICAL_CONTROL;
- } else
-#endif
- if ( IS_PSEARCH ) {
- if ( manageDSAit == SLAP_NO_CONTROL )
+ }
+ } else if ( IS_PSEARCH ) {
+ if ( manageDSAit == SLAP_NO_CONTROL ) {
manageDSAit = SLAP_CRITICAL_CONTROL;
+ }
}
- rs->sr_err = LOCK_ID (bdb->bi_dbenv, &locker );
+ rs->sr_err = LOCK_ID( bdb->bi_dbenv, &locker );
switch(rs->sr_err) {
case 0:
if ( sop->o_req_ndn.bv_len == 0 ) {
/* DIT root special case */
- e = (Entry *) &slap_entry_root;
- rs->sr_err = 0;
+ ei_root.bei_e = &e_root;
+ ei_root.bei_parent = &ei_root;
+ e_root.e_private = &ei_root;
+ e_root.e_id = 1;
+ ei = &ei_root;
+ rs->sr_err = LDAP_SUCCESS;
} else {
dn2entry_retry:
/* get entry with reader lock */
switch(rs->sr_err) {
case DB_NOTFOUND:
- matched = ei->bei_e; break;
+ matched = ei->bei_e;
+ break;
case 0:
- e = ei->bei_e; break;
+ e = ei->bei_e;
+ break;
case LDAP_BUSY:
send_ldap_error( sop, rs, LDAP_BUSY, "ldap server busy" );
LOCK_ID_FREE (bdb->bi_dbenv, locker );
}
if ( e == NULL ) {
- struct berval matched_dn = { 0, NULL };
+ struct berval matched_dn = BER_BVNULL;
if ( matched != NULL ) {
BerVarray erefs;
NULL, &sop->o_req_dn, sop->oq_search.rs_scope );
}
- rs->sr_err=LDAP_REFERRAL;
+ rs->sr_err = LDAP_REFERRAL;
rs->sr_matched = matched_dn.bv_val;
send_ldap_result( sop, rs );
return rs->sr_err;
}
- if (!manageDSAit && e != &slap_entry_root && is_entry_referral( e ) ) {
+ if ( !manageDSAit && e != &e_root && is_entry_referral( e ) ) {
/* entry is a referral, don't allow add */
struct berval matched_dn;
BerVarray erefs;
return 1;
}
- /* if not root, get appropriate limits */
- if ( be_isroot( op->o_bd, &sop->o_ndn ) ) {
- isroot = 1;
- } else {
- ( void ) get_limits( op->o_bd, &sop->o_ndn, &limit );
- }
-
- /* The time/size limits come first because they require very little
- * effort, so there's no chance the candidates are selected and then
- * the request is not honored only because of time/size constraints */
-
- /* if no time limit requested, use soft limit (unless root!) */
- if ( isroot ) {
- if ( sop->oq_search.rs_tlimit == 0 ) {
- sop->oq_search.rs_tlimit = -1; /* allow root to set no limit */
- }
-
- if ( sop->oq_search.rs_slimit == 0 ) {
- sop->oq_search.rs_slimit = -1;
- }
-
- } else {
- /* if no limit is required, use soft limit */
- if ( sop->oq_search.rs_tlimit <= 0 ) {
- sop->oq_search.rs_tlimit = limit->lms_t_soft;
-
- /* if requested limit higher than hard limit, abort */
- } else if ( sop->oq_search.rs_tlimit > limit->lms_t_hard ) {
- /* no hard limit means use soft instead */
- if ( limit->lms_t_hard == 0
- && limit->lms_t_soft > -1
- && sop->oq_search.rs_tlimit > limit->lms_t_soft ) {
- sop->oq_search.rs_tlimit = limit->lms_t_soft;
-
- /* positive hard limit means abort */
- } else if ( limit->lms_t_hard > 0 ) {
- rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
- send_ldap_result( sop, rs );
- rs->sr_err = 0;
- goto done;
- }
-
- /* negative hard limit means no limit */
- }
-
- /* if no limit is required, use soft limit */
- if ( sop->oq_search.rs_slimit <= 0 ) {
- if ( get_pagedresults(sop) && limit->lms_s_pr != 0 ) {
- sop->oq_search.rs_slimit = limit->lms_s_pr;
- } else {
- sop->oq_search.rs_slimit = limit->lms_s_soft;
- }
-
- /* if requested limit higher than hard limit, abort */
- } else if ( sop->oq_search.rs_slimit > limit->lms_s_hard ) {
- /* no hard limit means use soft instead */
- if ( limit->lms_s_hard == 0
- && limit->lms_s_soft > -1
- && sop->oq_search.rs_slimit > limit->lms_s_soft ) {
- sop->oq_search.rs_slimit = limit->lms_s_soft;
-
- /* positive hard limit means abort */
- } else if ( limit->lms_s_hard > 0 ) {
- rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
- send_ldap_result( sop, rs );
- rs->sr_err = 0;
- goto done;
- }
-
- /* negative hard limit means no limit */
- }
+ if ( get_assert( op ) &&
+ ( test_filter( op, e, get_assertion( op )) != LDAP_COMPARE_TRUE ))
+ {
+ rs->sr_err = LDAP_ASSERTION_FAILED;
+ send_ldap_result( sop, rs );
+ return 1;
}
/* compute it anyway; root does not use it */
- stoptime = op->o_time + sop->oq_search.rs_tlimit;
+ stoptime = op->o_time + sop->ors_tlimit;
/* need normalized dn below */
ber_dupbv( &realbase, &e->e_nname );
base.e_nname = realbase;
base.e_id = e->e_id;
- if ( e != &slap_entry_root ) {
+ if ( e != &e_root ) {
bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
}
e = NULL;
+ if ( !IS_PSEARCH ) {
+ rs->sr_err = bdb_get_commit_csn( sop, rs, &search_context_csn,
+ locker, &ctxcsn_lock );
+
+ if ( rs->sr_err != LDAP_SUCCESS ) {
+ send_ldap_error( sop, rs, rs->sr_err,
+ "error in csn management in search" );
+ goto done;
+ }
+
+ if ( sop->o_sync_mode != SLAP_SYNC_NONE &&
+ sop->o_sync_state.ctxcsn &&
+ sop->o_sync_state.ctxcsn->bv_val &&
+ ber_bvcmp( &sop->o_sync_state.ctxcsn[0], search_context_csn ) == 0 )
+ {
+ bdb_cache_entry_db_unlock( bdb->bi_dbenv, &ctxcsn_lock );
+ goto nochange;
+ }
+ } else {
+ search_context_csn = ber_dupbv( NULL, &op->o_sync_csn );
+ }
+
/* select candidates */
if ( sop->oq_search.rs_scope == LDAP_SCOPE_BASE ) {
rs->sr_err = base_candidate( op->o_bd, &base, candidates );
} else {
BDB_IDL_ZERO( candidates );
BDB_IDL_ZERO( scopes );
- rs->sr_err = search_candidates( op, sop, rs, &base, locker, candidates, scopes );
+ rs->sr_err = search_candidates( op, sop, rs, &base,
+ locker, candidates, scopes );
+ }
+
+ if ( !IS_PSEARCH && sop->o_sync_mode != SLAP_SYNC_NONE ) {
+ bdb_cache_entry_db_unlock( bdb->bi_dbenv, &ctxcsn_lock );
}
/* start cursor at beginning of candidates.
*/
cursor = 0;
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
if (IS_PSEARCH) {
if ( !BDB_IDL_IS_RANGE( candidates ) ) {
cursor = bdb_idl_search( candidates, ps_e->e_id );
rs->sr_err = LDAP_SUCCESS;
goto done;
}
- } else {
- if ( ps_e->e_id < BDB_IDL_RANGE_FIRST(candidates)
- || ps_e->e_id > BDB_IDL_RANGE_LAST(candidates)){
- rs->sr_err = LDAP_SUCCESS;
- goto done;
- }
+ } else if ( ps_e->e_id < BDB_IDL_RANGE_FIRST( candidates ) ||
+ ps_e->e_id > BDB_IDL_RANGE_LAST( candidates ))
+ {
+ rs->sr_err = LDAP_SUCCESS;
+ goto done;
}
candidates[0] = 1;
candidates[1] = ps_e->e_id;
}
-#endif
if ( candidates[0] == 0 ) {
#ifdef NEW_LOGGING
0, 0, 0 );
#endif
- rs->sr_err = LDAP_SUCCESS;
- send_ldap_result( sop, rs );
- rs->sr_err = 1;
- goto done;
+ goto nochange;
}
/* if not root and candidates exceed to-be-checked entries, abort */
- if ( !isroot && limit->lms_s_unchecked != -1 ) {
- if ( BDB_IDL_N(candidates) > (unsigned) limit->lms_s_unchecked ) {
- rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
- send_ldap_result( sop, rs );
- rs->sr_err = 1;
- goto done;
- }
+ if ( sop->ors_limit /* isroot == TRUE */
+ && sop->ors_limit->lms_s_unchecked != -1
+ && BDB_IDL_N(candidates) > (unsigned) sop->ors_limit->lms_s_unchecked )
+ {
+ rs->sr_err = LDAP_ADMINLIMIT_EXCEEDED;
+ send_ldap_result( sop, rs );
+ rs->sr_err = LDAP_SUCCESS;
+ goto done;
}
- if ( isroot || !limit->lms_s_pr_hide ) {
+ if ( sop->ors_limit == NULL /* isroot == FALSE */
+ || !sop->ors_limit->lms_s_pr_hide ) {
tentries = BDB_IDL_N(candidates);
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
if ( get_pagedresults(sop) ) {
- if ( sop->o_pagedresults_state.ps_cookie == 0 ) {
- id = 0;
+ if ( (ID)( sop->o_pagedresults_state.ps_cookie ) == 0 ) {
+ id = bdb_idl_first( candidates, &cursor );
+
} else {
if ( sop->o_pagedresults_size == 0 ) {
rs->sr_err = LDAP_SUCCESS;
}
for ( id = bdb_idl_first( candidates, &cursor );
id != NOID && id <= (ID)( sop->o_pagedresults_state.ps_cookie );
- id = bdb_idl_next( candidates, &cursor ) );
+ id = bdb_idl_next( candidates, &cursor ) ) /* empty */;
}
if ( cursor == NOID ) {
#ifdef NEW_LOGGING
#endif
send_pagerequest_response( sop, rs, lastid, 0 );
- rs->sr_err = 1;
+ rs->sr_err = LDAP_OTHER;
goto done;
}
goto loop_begin;
}
-#endif
-#ifdef LDAP_CLIENT_UPDATE
- if ( (sop->o_clientupdate_type & SLAP_LCUP_SYNC) ||
- (IS_PSEARCH && sop->o_ps_protocol == LDAP_CLIENT_UPDATE ))
- {
+ if (( sop->o_sync_mode & SLAP_SYNC_REFRESH ) || IS_PSEARCH ) {
+ int match;
+
cookief.f_choice = LDAP_FILTER_AND;
cookief.f_and = &csnfnot;
cookief.f_next = NULL;
csnfeq.f_choice = LDAP_FILTER_EQUALITY;
csnfeq.f_ava = &aa_eq;
csnfeq.f_av_desc = slap_schema.si_ad_entryCSN;
- csnfeq.f_av_value = sop->o_clientupdate_state;
+ if ( sop->o_sync_state.ctxcsn != NULL ) {
+ csnfeq.f_av_value = *sop->o_sync_state.ctxcsn;
+ } else {
+ csnfeq.f_av_value = slap_empty_bv;
+ }
csnfand.f_choice = LDAP_FILTER_AND;
csnfand.f_and = &csnfge;
csnfge.f_choice = LDAP_FILTER_GE;
csnfge.f_ava = &aa_ge;
csnfge.f_av_desc = slap_schema.si_ad_entryCSN;
- csnfge.f_av_value = sop->o_clientupdate_state;
- csnfge.f_next = sop->oq_search.rs_filter;
- }
-#endif
-#if defined(LDAP_CLIENT_UPDATE) && defined(LDAP_SYNC)
- else
-#endif
-#ifdef LDAP_SYNC
- if ( (sop->o_sync_mode & SLAP_SYNC_REFRESH) ||
- ( IS_PSEARCH && sop->o_ps_protocol == LDAP_SYNC ))
- {
- cookief.f_choice = LDAP_FILTER_AND;
- cookief.f_and = &csnfnot;
- cookief.f_next = NULL;
-
- csnfnot.f_choice = LDAP_FILTER_NOT;
- csnfnot.f_not = &csnfeq;
- csnfnot.f_next = &csnfand;
-
- csnfeq.f_choice = LDAP_FILTER_EQUALITY;
- csnfeq.f_ava = &aa_eq;
- csnfeq.f_av_desc = slap_schema.si_ad_entryCSN;
- csnfeq.f_av_value = sop->o_sync_state;
+ if ( sop->o_sync_state.ctxcsn != NULL ) {
+ csnfge.f_av_value = *sop->o_sync_state.ctxcsn;
+ } else {
+ csnfge.f_av_value = slap_empty_bv;
+ }
- csnfand.f_choice = LDAP_FILTER_AND;
- csnfand.f_and = &csnfge;
- csnfand.f_next = NULL;
+ if ( search_context_csn && !IS_PSEARCH ) {
+ csnfge.f_next = &contextcsnand;
- csnfge.f_choice = LDAP_FILTER_GE;
- csnfge.f_ava = &aa_ge;
- csnfge.f_av_desc = slap_schema.si_ad_entryCSN;
- csnfge.f_av_value = sop->o_sync_state;
- csnfge.f_next = sop->oq_search.rs_filter;
+ contextcsnand.f_choice = LDAP_FILTER_AND;
+ contextcsnand.f_and = &contextcsnle;
+ contextcsnand.f_next = NULL;
+
+ contextcsnle.f_choice = LDAP_FILTER_LE;
+ contextcsnle.f_ava = &aa_le;
+ contextcsnle.f_av_desc = slap_schema.si_ad_entryCSN;
+ contextcsnle.f_av_value = *search_context_csn;
+ contextcsnle.f_next = sop->oq_search.rs_filter;
+
+ mr = slap_schema.si_ad_entryCSN->ad_type->sat_ordering;
+ if ( sop->o_sync_state.ctxcsn &&
+ sop->o_sync_state.ctxcsn->bv_val != NULL )
+ {
+ value_match( &match, slap_schema.si_ad_entryCSN, mr,
+ SLAP_MR_VALUE_OF_ATTRIBUTE_SYNTAX,
+ &sop->o_sync_state.ctxcsn[0], search_context_csn,
+ &text );
+ } else {
+ match = -1;
+ }
+ no_sync_state_change = ( match >= 0 );
+ } else {
+ csnfge.f_next = sop->oq_search.rs_filter;
+ }
}
-#endif
for ( id = bdb_idl_first( candidates, &cursor );
- id != NOID;
+ id != NOID && !no_sync_state_change;
id = bdb_idl_next( candidates, &cursor ) )
{
- int scopeok = 0;
+ int scopeok = 0;
loop_begin:
/* check for abandon */
if ( sop->o_abandon ) {
- rs->sr_err = 0;
+ if ( sop != op ) {
+ bdb_drop_psearch( sop, sop->o_msgid );
+ }
+ rs->sr_err = LDAP_SUCCESS;
goto done;
}
-#ifdef LDAP_EXOP_X_CANCEL
if ( sop->o_cancel ) {
assert( sop->o_cancel == SLAP_CANCEL_REQ );
rs->sr_err = LDAP_CANCELLED;
send_ldap_result( sop, rs );
sop->o_cancel = SLAP_CANCEL_ACK;
- rs->sr_err = 0;
+ rs->sr_err = LDAP_SUCCESS;
goto done;
}
-#endif
/* check time limit */
- if ( sop->oq_search.rs_tlimit != -1 && slap_get_time() > stoptime ) {
+ if ( sop->ors_tlimit != -1 && slap_get_time() > stoptime ) {
rs->sr_err = LDAP_TIMELIMIT_EXCEEDED;
rs->sr_ref = rs->sr_v2ref;
send_ldap_result( sop, rs );
+ rs->sr_err = LDAP_SUCCESS;
goto done;
}
-
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
if (!IS_PSEARCH) {
-#endif
id2entry_retry:
/* get the entry with reader lock */
ei = NULL;
goto id2entry_retry;
}
- if ( ei && rs->sr_err == 0 ) {
+ if ( ei && rs->sr_err == LDAP_SUCCESS ) {
e = ei->bei_e;
} else {
e = NULL;
goto loop_continue;
}
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
} else {
e = ps_e;
}
-#endif
rs->sr_entry = e;
+
#ifdef BDB_SUBENTRIES
- if ( !is_sync_protocol( sop ) ) {
+ /* FIXME: send all but syncrepl */
+#if 0
+ if ( !is_sync_protocol( sop ) )
+#endif
+ {
if ( is_entry_subentry( e ) ) {
if( sop->oq_search.rs_scope != LDAP_SCOPE_BASE ) {
if(!get_subentries_visibility( sop )) {
goto loop_continue;
}
}
-#endif
+#endif /* BDB_SUBENTRIES */
/* Does this candidate actually satisfy the search scope?
*
switch( sop->ors_scope ) {
case LDAP_SCOPE_BASE:
/* This is always true, yes? */
- if ( id == base.e_id )
- scopeok = 1;
+ if ( id == base.e_id ) scopeok = 1;
break;
+
case LDAP_SCOPE_ONELEVEL:
- if ( ei->bei_parent->bei_id == base.e_id )
- scopeok = 1;
+ if ( ei->bei_parent->bei_id == base.e_id ) scopeok = 1;
break;
- case LDAP_SCOPE_SUBTREE:
- { EntryInfo *tmp;
- for ( tmp = BEI(e); tmp->bei_parent;
- tmp = tmp->bei_parent ) {
+
+#ifdef LDAP_SCOPE_CHILDREN
+ case LDAP_SCOPE_CHILDREN:
+ if ( id == base.e_id ) break;
+ /* Fall-thru */
+#endif
+ case LDAP_SCOPE_SUBTREE: {
+ EntryInfo *tmp;
+ for (tmp = BEI(e); tmp->bei_parent;
+ tmp = tmp->bei_parent ) {
if ( tmp->bei_id == base.e_id ) {
scopeok = 1;
break;
}
- } }
- break;
+ }
+ } break;
}
#ifdef BDB_ALIASES
* deref it when finding, return it.
*/
if ( is_entry_alias(e) &&
- ((sop->ors_deref & LDAP_DEREF_FINDING)
- || !bvmatch(&e->e_nname, &op->o_req_ndn)))
+ ((sop->ors_deref & LDAP_DEREF_FINDING) ||
+ !bvmatch(&e->e_nname, &op->o_req_ndn)))
{
goto loop_continue;
}
if ( !scopeok && BDB_IDL_N(scopes) ) {
unsigned x;
if ( sop->ors_scope == LDAP_SCOPE_ONELEVEL ) {
- x = bdb_idl_search( scopes,
- e->e_id );
- if ( scopes[x] == e->e_id )
- scopeok = 1;
+ x = bdb_idl_search( scopes, e->e_id );
+ if ( scopes[x] == e->e_id ) scopeok = 1;
} else {
- /* subtree, walk up the tree */
+ /* subtree, walk up the tree */
EntryInfo *tmp = BEI(e);
- for (;tmp->bei_parent;
- tmp=tmp->bei_parent) {
- x = bdb_idl_search(
- scopes, tmp->bei_id );
+ for (;tmp->bei_parent; tmp=tmp->bei_parent) {
+ x = bdb_idl_search( scopes, tmp->bei_id );
if ( scopes[x] == tmp->bei_id ) {
scopeok = 1;
break;
&& is_entry_referral( e ) )
{
BerVarray erefs = get_entry_referrals( sop, e );
- rs->sr_ref = referral_rewrite( erefs,
- &e->e_name, NULL,
- sop->oq_search.rs_scope == LDAP_SCOPE_SUBTREE
- ? LDAP_SCOPE_SUBTREE
- : LDAP_SCOPE_BASE );
+ rs->sr_ref = referral_rewrite( erefs, &e->e_name, NULL,
+ sop->oq_search.rs_scope == LDAP_SCOPE_ONELEVEL
+ ? LDAP_SCOPE_BASE : LDAP_SCOPE_SUBTREE );
send_search_reference( sop, rs );
goto loop_continue;
}
+ if ( !manageDSAit && is_entry_glue( e )) {
+ goto loop_continue;
+ }
+
/* if it matches the filter and scope, send it */
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
if (IS_PSEARCH) {
if (ps_type != LDAP_PSEARCH_BY_SCOPEOUT) {
rs->sr_err = test_filter( sop, rs->sr_entry, &cookief );
rs->sr_err = LDAP_COMPARE_TRUE;
}
} else {
-#ifdef LDAP_CLIENT_UPDATE
- if ( sop->o_clientupdate_type & SLAP_LCUP_SYNC ) {
- rs->sr_err = test_filter( sop, rs->sr_entry, &cookief );
- } else
-#endif
-#ifdef LDAP_SYNC
if ( sop->o_sync_mode & SLAP_SYNC_REFRESH ) {
rc_sync = test_filter( sop, rs->sr_entry, &cookief );
- rs->sr_err = test_filter( sop,
- rs->sr_entry, sop->oq_search.rs_filter );
+ rs->sr_err = test_filter( sop, rs->sr_entry, &contextcsnand );
if ( rs->sr_err == LDAP_COMPARE_TRUE ) {
if ( rc_sync == LDAP_COMPARE_TRUE ) {
+ if ( no_sync_state_change ) {
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, RESULTS,
+ "bdb_search: error in context csn management\n",
+ 0, 0, 0 );
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "bdb_search: error in context csn management\n",
+ 0, 0, 0 );
+#endif
+ }
entry_sync_state = LDAP_SYNC_ADD;
} else {
+ if ( no_sync_state_change ) {
+ goto loop_continue;
+ }
entry_sync_state = LDAP_SYNC_PRESENT;
}
}
- } else
-#endif
-#endif
- {
+ } else {
rs->sr_err = test_filter( sop,
rs->sr_entry, sop->oq_search.rs_filter );
}
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
}
-#endif
if ( rs->sr_err == LDAP_COMPARE_TRUE ) {
/* check size limit */
- if ( --sop->oq_search.rs_slimit == -1 ) {
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
- if (!IS_PSEARCH)
-#endif
- bdb_cache_return_entry_r( bdb->bi_dbenv,
- &bdb->bi_cache, e, &lock );
+ if ( --sop->ors_slimit == -1 &&
+ sop->o_sync_slog_size == -1 )
+ {
+ if (!IS_PSEARCH) {
+ bdb_cache_return_entry_r( bdb->bi_dbenv,
+ &bdb->bi_cache, e, &lock );
+ }
e = NULL;
rs->sr_entry = NULL;
rs->sr_err = LDAP_SIZELIMIT_EXCEEDED;
rs->sr_ref = rs->sr_v2ref;
send_ldap_result( sop, rs );
+ rs->sr_err = LDAP_SUCCESS;
goto done;
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
if ( get_pagedresults(sop) ) {
if ( rs->sr_nentries >= sop->o_pagedresults_size ) {
send_pagerequest_response( sop, rs,
}
lastid = id;
}
-#endif
if (e) {
/* safe default */
int result = -1;
-#if 0 /* noop is masked SLAP_CTRL_UPDATE */
- if( op->o_noop ) {
- result = 0;
- } else
-#endif
-#if defined(LDAP_CLIENT_UPDATE) || defined(LDAP_SYNC)
if (IS_PSEARCH) {
-#ifdef LDAP_SYNC
int premodify_found = 0;
int entry_sync_state;
-#endif
if ( ps_type == LDAP_PSEARCH_BY_ADD ||
ps_type == LDAP_PSEARCH_BY_DELETE ||
&op->o_pm_list, ps_link)
{
if( psid_e->ps_op == sop ) {
-#ifdef LDAP_SYNC
premodify_found = 1;
-#endif
LDAP_LIST_REMOVE(psid_e, ps_link);
break;
}
}
if (psid_e != NULL) free (psid_e);
}
-#ifdef LDAP_SYNC
if ( ps_type == LDAP_PSEARCH_BY_ADD ) {
entry_sync_state = LDAP_SYNC_ADD;
} else if ( ps_type == LDAP_PSEARCH_BY_DELETE ) {
} else {
entry_sync_state = LDAP_SYNC_ADD;
}
- } else if ( ps_type == LDAP_PSEARCH_BY_SCOPEOUT )
+ } else if ( ps_type == LDAP_PSEARCH_BY_SCOPEOUT ) {
entry_sync_state = LDAP_SYNC_DELETE;
- else {
- rs->sr_err = 1;
+ } else {
+ rs->sr_err = LDAP_OTHER;
goto done;
}
-#endif
-
-#ifdef LDAP_CLIENT_UPDATE
- if ( sop->o_ps_protocol == LDAP_CLIENT_UPDATE ) {
- int entry_count = ++sop->o_ps_entries;
- if ( IS_BDB_REPLACE(ps_type) ) {
- rs->sr_err = bdb_build_lcup_update_ctrl( sop,
- rs, e, entry_count, ctrls,
- num_ctrls++, &latest_entrycsn_bv,
- SLAP_LCUP_ENTRY_DELETED_TRUE );
+ if ( sop->o_sync_slog_size != -1 ) {
+ if ( entry_sync_state == LDAP_SYNC_DELETE ) {
+ result = slap_add_session_log( op, sop, e );
} else {
- rs->sr_err = bdb_build_lcup_update_ctrl( sop,
- rs, e, entry_count, ctrls,
- num_ctrls++, &latest_entrycsn_bv,
- SLAP_LCUP_ENTRY_DELETED_FALSE );
+ result = 1;
}
- if ( rs->sr_err != LDAP_SUCCESS ) goto done;
- rs->sr_attrs = attrs;
- rs->sr_ctrls = ctrls;
- result = send_search_entry( sop, rs );
- ch_free( ctrls[num_ctrls-1]->ldctl_value.bv_val );
- ch_free( ctrls[--num_ctrls] );
- ctrls[num_ctrls] = NULL;
- rs->sr_ctrls = NULL;
- } else
-#endif
-#ifdef LDAP_SYNC
- if ( sop->o_ps_protocol == LDAP_SYNC ) {
- rs->sr_err = bdb_build_sync_state_ctrl( sop,
+ } else {
+ struct berval cookie;
+ slap_compose_sync_cookie( sop, &cookie,
+ search_context_csn,
+ sop->o_sync_state.sid,
+ sop->o_sync_state.rid );
+ rs->sr_err = slap_build_sync_state_ctrl( sop,
rs, e, entry_sync_state, ctrls,
- num_ctrls++, 1, &latest_entrycsn_bv );
+ num_ctrls++, 1, &cookie );
if ( rs->sr_err != LDAP_SUCCESS ) goto done;
rs->sr_attrs = attrs;
rs->sr_ctrls = ctrls;
+ rs->sr_flags = 0;
result = send_search_entry( sop, rs );
- ch_free( ctrls[num_ctrls-1]->ldctl_value.bv_val );
- ch_free( ctrls[--num_ctrls] );
+ if ( cookie.bv_val ) ch_free( cookie.bv_val );
+ slap_sl_free( ctrls[num_ctrls-1]->ldctl_value.bv_val,
+ sop->o_tmpmemctx );
+ slap_sl_free( ctrls[--num_ctrls], sop->o_tmpmemctx );
ctrls[num_ctrls] = NULL;
rs->sr_ctrls = NULL;
- } else
-#endif
- {
- rs->sr_err = 1;
- goto done;
}
-
} else if ( ps_type == LDAP_PSEARCH_BY_PREMODIFY ) {
struct psid_entry* psid_e;
- psid_e = (struct psid_entry *) calloc (1,
+ psid_e = (struct psid_entry *) ch_calloc(1,
sizeof(struct psid_entry));
psid_e->ps_op = sop;
LDAP_LIST_INSERT_HEAD( &op->o_pm_list,
psid_e, ps_link );
} else {
- printf("Error !\n");
+#ifdef NEW_LOGGING
+ LDAP_LOG ( OPERATION, RESULTS,
+ "bdb_search: invalid ps_type (%d) \n",
+ ps_type, 0, 0);
+#else
+ Debug( LDAP_DEBUG_TRACE,
+ "bdb_search: invalid ps_type (%d) \n",
+ ps_type, 0, 0);
+#endif
}
} else {
-#ifdef LDAP_CLIENT_UPDATE
- if ( sop->o_clientupdate_type & SLAP_LCUP_SYNC ) {
- rs->sr_err = bdb_build_lcup_update_ctrl( sop,
- rs, e, ++entry_count, ctrls,
- num_ctrls++, &latest_entrycsn_bv,
- SLAP_LCUP_ENTRY_DELETED_FALSE );
- if ( rs->sr_err != LDAP_SUCCESS ) goto done;
- rs->sr_ctrls = ctrls;
- rs->sr_attrs = sop->oq_search.rs_attrs;
- result = send_search_entry( sop, rs );
- ch_free( ctrls[num_ctrls-1]->ldctl_value.bv_val );
- ch_free( ctrls[--num_ctrls] );
- ctrls[num_ctrls] = NULL;
- rs->sr_ctrls = NULL;
- } else
-#endif
-#ifdef LDAP_SYNC
if ( sop->o_sync_mode & SLAP_SYNC_REFRESH ) {
- rs->sr_err = bdb_build_sync_state_ctrl( sop,
- rs, e, entry_sync_state, ctrls,
- num_ctrls++, 0, &latest_entrycsn_bv );
- if ( rs->sr_err != LDAP_SUCCESS ) goto done;
-
- rs->sr_ctrls = ctrls;
if ( rc_sync == LDAP_COMPARE_TRUE ) { /* ADD */
+ rs->sr_err = slap_build_sync_state_ctrl( sop,
+ rs, e, entry_sync_state, ctrls,
+ num_ctrls++, 0, NULL );
+ if ( rs->sr_err != LDAP_SUCCESS ) goto done;
+ rs->sr_ctrls = ctrls;
rs->sr_attrs = sop->oq_search.rs_attrs;
+ rs->sr_flags = 0;
+ result = send_search_entry( sop, rs );
+ slap_sl_free( ctrls[num_ctrls-1]->ldctl_value.bv_val,
+ sop->o_tmpmemctx );
+ slap_sl_free( ctrls[--num_ctrls], sop->o_tmpmemctx );
+ ctrls[num_ctrls] = NULL;
+ rs->sr_ctrls = NULL;
} else { /* PRESENT */
- rs->sr_attrs = &null_attr;
+ if ( sync_send_present_mode ) {
+ result = slap_build_syncUUID_set( sop,
+ &syncUUID_set, e );
+ if ( result <= 0 ) {
+ result = -1;
+ } else {
+ syncUUID_set_cnt++;
+ if ( syncUUID_set_cnt ==
+ SLAP_SYNCUUID_SET_SIZE )
+ {
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_rspoid = LDAP_SYNC_INFO;
+ rs->sr_ctrls = NULL;
+ result = slap_send_syncinfo( sop, rs,
+ LDAP_TAG_SYNC_ID_SET,
+ NULL, 0, syncUUID_set, 0 );
+ if ( result != LDAP_SUCCESS ) {
+ result = -1;
+ }
+ ber_bvarray_free_x( syncUUID_set,
+ sop->o_tmpmemctx );
+ syncUUID_set = NULL;
+ syncUUID_set_cnt = 0;
+ }
+ }
+ } else {
+ result = 1;
+ }
}
- result = send_search_entry( sop, rs );
- ch_free( ctrls[num_ctrls-1]->ldctl_value.bv_val );
- ch_free( ctrls[--num_ctrls] );
- ctrls[num_ctrls] = NULL;
- rs->sr_ctrls = NULL;
- } else
-#endif
-#endif
- {
+ } else {
rs->sr_attrs = sop->oq_search.rs_attrs;
rs->sr_ctrls = NULL;
+ rs->sr_flags = 0;
+ rs->sr_err = LDAP_SUCCESS;
result = send_search_entry( sop, rs );
}
}
/* free reader lock */
if (!IS_PSEARCH) {
bdb_cache_return_entry_r( bdb->bi_dbenv,
- &bdb->bi_cache, e , &lock);
+ &bdb->bi_cache, e , &lock );
+ if ( sop->o_nocaching ) {
+ bdb_cache_delete_entry( bdb, ei, locker, &lock );
+ }
}
e = NULL;
rs->sr_entry = NULL;
ldap_pvt_thread_yield();
}
+ if ( syncUUID_set_cnt > 0 ) {
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_rspoid = LDAP_SYNC_INFO;
+ rs->sr_ctrls = NULL;
+ slap_send_syncinfo( sop, rs, LDAP_TAG_SYNC_ID_SET,
+ NULL, 0, syncUUID_set, 0 );
+ ber_bvarray_free_x( syncUUID_set, sop->o_tmpmemctx );
+ syncUUID_set_cnt = 0;
+ }
+
+nochange:
if (!IS_PSEARCH) {
-#ifdef LDAP_CLIENT_UPDATE
- if ( sop->o_clientupdate_type & SLAP_LCUP_SYNC ) {
- bdb_build_lcup_done_ctrl( sop, rs, ctrls,
- num_ctrls++, &latest_entrycsn_bv );
-
- rs->sr_ctrls = ctrls;
- rs->sr_ref = rs->sr_v2ref;
- rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS : LDAP_REFERRAL;
- send_ldap_result( sop, rs );
+ if ( sop->o_sync_mode & SLAP_SYNC_REFRESH ) {
+ if ( sop->o_sync_mode & SLAP_SYNC_PERSIST ) {
+ struct berval cookie;
+ slap_compose_sync_cookie( sop, &cookie, search_context_csn,
+ sop->o_sync_state.sid, sop->o_sync_state.rid );
+
+ if ( sync_send_present_mode ) {
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_rspoid = LDAP_SYNC_INFO;
+ rs->sr_ctrls = NULL;
+ slap_send_syncinfo( sop, rs,
+ LDAP_TAG_SYNC_REFRESH_PRESENT, &cookie, 1, NULL, 0 );
+ } else {
+ if ( !no_sync_state_change ) {
+ int slog_found = 0;
+ ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
+ LDAP_LIST_FOREACH( ps_list, &bdb->bi_psearch_list,
+ o_ps_link )
+ {
+ if ( ps_list->o_sync_slog_size > 0 ) {
+ if ( ps_list->o_sync_state.sid ==
+ sop->o_sync_state.sid ) {
+ slog_found = 1;
+ break;
+ }
+ }
+ }
+
+ if ( slog_found ) {
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_rspoid = NULL;
+ rs->sr_ctrls = NULL;
+ slap_send_session_log( op, ps_list, rs );
+ }
+ ldap_pvt_thread_rdwr_runlock( &bdb->bi_pslist_rwlock );
+ }
+ rs->sr_err = LDAP_SUCCESS;
+ rs->sr_rspoid = LDAP_SYNC_INFO;
+ rs->sr_ctrls = NULL;
+ slap_send_syncinfo( sop, rs,
+ LDAP_TAG_SYNC_REFRESH_DELETE, &cookie, 1, NULL, 0 );
+ }
- ch_free( latest_entrycsn_bv.bv_val );
- latest_entrycsn_bv.bv_val = NULL;
+ if ( cookie.bv_val ) {
+ ch_free( cookie.bv_val );
+ }
+ } else {
+ /* refreshOnly mode */
+ struct berval cookie;
+ slap_compose_sync_cookie( sop, &cookie, search_context_csn,
+ sop->o_sync_state.sid, sop->o_sync_state.rid );
+
+ if ( sync_send_present_mode ) {
+ slap_build_sync_done_ctrl( sop, rs, ctrls,
+ num_ctrls++, 1, &cookie, LDAP_SYNC_REFRESH_PRESENTS );
+ } else {
+ if ( !no_sync_state_change ) {
+ int slog_found = 0;
+ ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
+ LDAP_LIST_FOREACH( ps_list, &bdb->bi_psearch_list,
+ o_ps_link )
+ {
+ if ( ps_list->o_sync_slog_size > 0 ) {
+ if ( ps_list->o_sync_state.sid ==
+ sop->o_sync_state.sid ) {
+ slog_found = 1;
+ break;
+ }
+ }
+ }
+
+ if ( slog_found ) {
+ slap_send_session_log( op, ps_list, rs );
+ }
+ ldap_pvt_thread_rdwr_runlock( &bdb->bi_pslist_rwlock );
+ }
+ slap_build_sync_done_ctrl( sop, rs, ctrls,
+ num_ctrls++, 1, &cookie, LDAP_SYNC_REFRESH_DELETES );
+ }
- if ( ctrls[num_ctrls-1]->ldctl_value.bv_val != NULL ) {
- ch_free( ctrls[num_ctrls-1]->ldctl_value.bv_val );
- }
- ch_free( ctrls[--num_ctrls] );
- ctrls[num_ctrls] = NULL;
- } else
-#endif
-#ifdef LDAP_SYNC
- if ( sop->o_sync_mode & SLAP_SYNC_REFRESH ) {
- if ( sop->o_sync_mode & SLAP_SYNC_PERSIST ) {
- /* refreshAndPersist mode */
- rs->sr_err = LDAP_SUCCESS;
- rs->sr_rspoid = LDAP_SYNC_INFO;
- rs->sr_ctrls = NULL;
- bdb_send_ldap_intermediate( sop, rs,
- LDAP_SYNC_REFRESH_DONE, &latest_entrycsn_bv );
+ rs->sr_ctrls = ctrls;
+ rs->sr_ref = rs->sr_v2ref;
+ rs->sr_err = (rs->sr_v2ref == NULL)
+ ? LDAP_SUCCESS : LDAP_REFERRAL;
+ rs->sr_rspoid = NULL;
+ send_ldap_result( sop, rs );
+ if ( ctrls[num_ctrls-1]->ldctl_value.bv_val != NULL ) {
+ slap_sl_free( ctrls[num_ctrls-1]->ldctl_value.bv_val,
+ sop->o_tmpmemctx );
+ }
+ slap_sl_free( ctrls[--num_ctrls], sop->o_tmpmemctx );
+ ctrls[num_ctrls] = NULL;
+ if ( cookie.bv_val ) ch_free( cookie.bv_val );
+ }
} else {
- /* refreshOnly mode */
- bdb_build_sync_done_ctrl( sop, rs, ctrls,
- num_ctrls++, 1, &latest_entrycsn_bv );
- rs->sr_ctrls = ctrls;
+ rs->sr_ctrls = NULL;
rs->sr_ref = rs->sr_v2ref;
rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS : LDAP_REFERRAL;
+ rs->sr_rspoid = NULL;
send_ldap_result( sop, rs );
- if ( ctrls[num_ctrls-1]->ldctl_value.bv_val != NULL ) {
- ch_free( ctrls[num_ctrls-1]->ldctl_value.bv_val );
- }
- ch_free( ctrls[--num_ctrls] );
- ctrls[num_ctrls] = NULL;
}
-
- ch_free( latest_entrycsn_bv.bv_val );
- latest_entrycsn_bv.bv_val = NULL;
- } else
-#endif
- {
- rs->sr_ctrls = NULL;
- rs->sr_ref = rs->sr_v2ref;
- rs->sr_err = (rs->sr_v2ref == NULL) ? LDAP_SUCCESS : LDAP_REFERRAL;
- send_ldap_result( sop, rs );
- }
}
rs->sr_err = LDAP_SUCCESS;
done:
if( !IS_PSEARCH && e != NULL ) {
/* free reader lock */
- bdb_cache_return_entry_r ( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
+ bdb_cache_return_entry_r( bdb->bi_dbenv, &bdb->bi_cache, e, &lock );
}
- LOCK_ID_FREE (bdb->bi_dbenv, locker );
+ LOCK_ID_FREE( bdb->bi_dbenv, locker );
+
+ ber_bvfree( search_context_csn );
if( rs->sr_v2ref ) {
ber_bvarray_free( rs->sr_v2ref );
static int oc_filter(
Filter *f,
int cur,
- int *max
-)
+ int *max )
{
int rc = 0;
+ assert( f );
+
if( cur > *max ) *max = cur;
- switch(f->f_choice) {
+ switch( f->f_choice ) {
case LDAP_FILTER_PRESENT:
if (f->f_desc == slap_schema.si_ad_objectClass) {
rc = 1;
case LDAP_FILTER_AND:
case LDAP_FILTER_OR:
cur++;
- for (f=f->f_and; f; f=f->f_next) {
+ for ( f=f->f_and; f; f=f->f_next ) {
(void) oc_filter(f, cur, max);
}
break;
ber_memfree_x(data, NULL);
}
-static void *search_stack(
- Operation *op
-)
+static void *search_stack( Operation *op )
{
struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
void *ret = NULL;
/* Dummy; we compute scope separately now */
nf.f_choice = SLAPD_FILTER_COMPUTED;
nf.f_result = LDAP_SUCCESS;
- nf.f_next = xf.f_or == op->oq_search.rs_filter
+ nf.f_next = ( xf.f_or == op->oq_search.rs_filter )
? op->oq_search.rs_filter : &xf ;
/* Filter depth increased again, adding dummy clause */
depth++;
return rc;
}
-#ifdef LDAP_CONTROL_PAGEDRESULTS
static void
send_pagerequest_response(
Operation *op,
int tentries )
{
LDAPControl ctrl, *ctrls[2];
- char berbuf[LBER_ELEMENT_SIZEOF];
- BerElement *ber = (BerElement *)berbuf;
- struct berval cookie = { 0, NULL };
+ BerElementBuffer berbuf;
+ BerElement *ber = (BerElement *)&berbuf;
+ struct berval cookie = BER_BVNULL;
PagedResultsCookie respcookie;
#ifdef NEW_LOGGING
lastid, rs->sr_nentries, NULL );
#else
Debug(LDAP_DEBUG_ARGS, "send_pagerequest_response: lastid: (0x%08lx) "
- "nentries: (0x%081x)\n", lastid, rs->sr_nentries, NULL );
+ "nentries: (0x%081x)\n", lastid, rs->sr_nentries, NULL );
#endif
ctrl.ldctl_value.bv_val = NULL;
respcookie = ( PagedResultsCookie )lastid;
op->o_conn->c_pagedresults_state.ps_cookie = respcookie;
+ op->o_conn->c_pagedresults_state.ps_count = op->o_pagedresults_state.ps_count + rs->sr_nentries;
cookie.bv_len = sizeof( respcookie );
cookie.bv_val = (char *)&respcookie;
done:
(void) ber_free_buf( ber );
-}
-#endif
-
-#ifdef LDAP_CLIENT_UPDATE
-int
-bdb_build_lcup_update_ctrl(
- Operation *op,
- SlapReply *rs,
- Entry *e,
- int entry_count,
- LDAPControl **ctrls,
- int num_ctrls,
- struct berval *latest_entrycsn_bv,
- int isdeleted )
-{
- Attribute* a;
- int ret;
- int res;
- const char *text = NULL;
-
- char berbuf[LBER_ELEMENT_SIZEOF];
- BerElement *ber = (BerElement *)berbuf;
-
- struct berval entrycsn_bv = { 0, NULL };
-
- ber_init2( ber, 0, LBER_USE_DER );
-
- ctrls[num_ctrls] = ch_malloc ( sizeof ( LDAPControl ) );
-
- for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
- AttributeDescription *desc = a->a_desc;
- if ( desc == slap_schema.si_ad_entryCSN ) {
- ber_dupbv( &entrycsn_bv, &a->a_vals[0] );
- if ( latest_entrycsn_bv->bv_val == NULL ) {
- ber_dupbv( latest_entrycsn_bv, &entrycsn_bv );
- } else {
- res = value_match( &ret, desc,
- desc->ad_type->sat_ordering, 0,
- &entrycsn_bv, latest_entrycsn_bv, &text );
- if ( res != LDAP_SUCCESS ) {
- ret = 0;
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_search: value_match failed\n",
- 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_search: value_match failed\n",
- 0, 0, 0 );
-#endif
- }
-
- if ( ret > 0 ) {
- ch_free( latest_entrycsn_bv->bv_val );
- latest_entrycsn_bv->bv_val = NULL;
- ber_dupbv( latest_entrycsn_bv, &entrycsn_bv );
- }
- }
- }
- }
-
- if ( entry_count % op->o_clientupdate_interval == 0 ) {
- ber_printf( ber,
- "{bb{sON}N}",
- SLAP_LCUP_STATE_UPDATE_FALSE,
- isdeleted,
- LDAP_CUP_COOKIE_OID, &entrycsn_bv );
- } else { /* Do not send cookie */
- ber_printf( ber,
- "{bbN}",
- SLAP_LCUP_STATE_UPDATE_FALSE,
- isdeleted );
- }
-
- ch_free( entrycsn_bv.bv_val );
- entrycsn_bv.bv_val = NULL;
-
- ctrls[num_ctrls]->ldctl_oid = LDAP_CONTROL_ENTRY_UPDATE;
- ctrls[num_ctrls]->ldctl_iscritical = op->o_clientupdate;
- ret = ber_flatten2( ber, &ctrls[num_ctrls]->ldctl_value, 1 );
-
- ber_free_buf( ber );
-
- if ( ret < 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_build_lcup_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_build_lcup_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#endif
- send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
- return ret;
- }
-
- return LDAP_SUCCESS;
-}
-
-int
-bdb_build_lcup_done_ctrl(
- Operation *op,
- SlapReply *rs,
- LDAPControl **ctrls,
- int num_ctrls,
- struct berval *latest_entrycsn_bv )
-{
- int ret;
- char berbuf[LBER_ELEMENT_SIZEOF];
- BerElement *ber = (BerElement *)berbuf;
-
- ber_init2( ber, NULL, LBER_USE_DER );
-
- ctrls[num_ctrls] = ch_malloc ( sizeof ( LDAPControl ) );
-
- ber_printf( ber, "{sON}", LDAP_CUP_COOKIE_OID, latest_entrycsn_bv );
-
- ctrls[num_ctrls]->ldctl_oid = LDAP_CONTROL_CLIENT_UPDATE_DONE;
- ctrls[num_ctrls]->ldctl_iscritical = op->o_clientupdate;
- ret = ber_flatten2( ber, &ctrls[num_ctrls]->ldctl_value, 1 );
-
- ber_free_buf( ber );
-
- if ( ret < 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_build_lcup_done_ctrl: ber_flatten2 failed\n", 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_build_lcup_done_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#endif
- send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
- return ret;
- }
-
- return LDAP_SUCCESS;
-}
-#endif
-
-#ifdef LDAP_SYNC
-int
-bdb_build_sync_state_ctrl(
- Operation *op,
- SlapReply *rs,
- Entry *e,
- int entry_sync_state,
- LDAPControl **ctrls,
- int num_ctrls,
- int send_cookie,
- struct berval *latest_entrycsn_bv )
-{
- Attribute* a;
- int ret;
- int res;
- const char *text = NULL;
-
- char berbuf[LBER_ELEMENT_SIZEOF];
- BerElement *ber = (BerElement *)berbuf;
-
- struct berval entryuuid_bv = { 0, NULL };
- struct berval entrycsn_bv = { 0, NULL };
-
- ber_init2( ber, 0, LBER_USE_DER );
-
- ctrls[num_ctrls] = ch_malloc ( sizeof ( LDAPControl ) );
-
- for ( a = e->e_attrs; a != NULL; a = a->a_next ) {
- AttributeDescription *desc = a->a_desc;
- if ( desc == slap_schema.si_ad_entryCSN ) {
- ber_dupbv( &entrycsn_bv, &a->a_vals[0] );
- if ( latest_entrycsn_bv->bv_val == NULL ) {
- ber_dupbv( latest_entrycsn_bv, &entrycsn_bv );
- } else {
- res = value_match( &ret, desc,
- desc->ad_type->sat_ordering, 0,
- &entrycsn_bv, latest_entrycsn_bv, &text );
- if ( res != LDAP_SUCCESS ) {
- ret = 0;
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_search: value_match failed\n",
- 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_search: value_match failed\n",
- 0, 0, 0 );
-#endif
- }
- if ( ret > 0 ) {
- ch_free( latest_entrycsn_bv->bv_val );
- latest_entrycsn_bv->bv_val = NULL;
- ber_dupbv( latest_entrycsn_bv, &entrycsn_bv );
- }
- }
- } else if ( desc == slap_schema.si_ad_entryUUID ) {
- ber_dupbv( &entryuuid_bv, &a->a_vals[0] );
- }
- }
-
- if ( send_cookie ) {
- ber_printf( ber, "{eOON}",
- entry_sync_state, &entryuuid_bv, &entrycsn_bv );
- } else {
- ber_printf( ber, "{eON}",
- entry_sync_state, &entryuuid_bv );
- }
-
- ch_free( entrycsn_bv.bv_val );
- entrycsn_bv.bv_val = NULL;
- ch_free( entryuuid_bv.bv_val );
- entryuuid_bv.bv_val = NULL;
-
- ctrls[num_ctrls]->ldctl_oid = LDAP_CONTROL_SYNC_STATE;
- ctrls[num_ctrls]->ldctl_iscritical = op->o_sync;
- ret = ber_flatten2( ber, &ctrls[num_ctrls]->ldctl_value, 1 );
-
- ber_free_buf( ber );
-
- if ( ret < 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_build_sync_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_build_sync_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#endif
- send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
- return ret;
- }
-
- return LDAP_SUCCESS;
-}
-
-int
-bdb_build_sync_done_ctrl(
- Operation *op,
- SlapReply *rs,
- LDAPControl **ctrls,
- int num_ctrls,
- int send_cookie,
- struct berval *latest_entrycsn_bv )
-{
- int ret;
- char berbuf[LBER_ELEMENT_SIZEOF];
- BerElement *ber = (BerElement *)berbuf;
-
- ber_init2( ber, NULL, LBER_USE_DER );
-
- ctrls[num_ctrls] = ch_malloc ( sizeof ( LDAPControl ) );
-
- if ( send_cookie ) {
- ber_printf( ber, "{ON}", latest_entrycsn_bv );
- } else {
- ber_printf( ber, "{N}" );
- }
-
- ctrls[num_ctrls]->ldctl_oid = LDAP_CONTROL_SYNC_DONE;
- ctrls[num_ctrls]->ldctl_iscritical = op->o_sync;
- ret = ber_flatten2( ber, &ctrls[num_ctrls]->ldctl_value, 1 );
-
- ber_free_buf( ber );
-
- if ( ret < 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_build_lcup_done_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_build_lcup_done_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#endif
- send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
- return ret;
- }
-
- return LDAP_SUCCESS;
}
-int
-bdb_send_ldap_intermediate(
- Operation *op,
- SlapReply *rs,
- int state,
- struct berval *cookie )
-{
- char berbuf[LBER_ELEMENT_SIZEOF];
- BerElement *ber = (BerElement *)berbuf;
- struct berval rspdata;
-
- int ret;
-
- ber_init2( ber, NULL, LBER_USE_DER );
-
- if ( cookie == NULL ) {
- ber_printf( ber, "{eN}", state );
- } else {
- ber_printf( ber, "{eON}", state, cookie );
- }
-
- ret = ber_flatten2( ber, &rspdata, 0 );
-
- if ( ret < 0 ) {
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, RESULTS,
- "bdb_build_lcup_done_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#else
- Debug( LDAP_DEBUG_TRACE,
- "bdb_build_lcup_done_ctrl: ber_flatten2 failed\n",
- 0, 0, 0 );
-#endif
- send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
- return ret;
- }
-
- rs->sr_rspdata = &rspdata;
- send_ldap_intermediate_resp( op, rs );
- rs->sr_rspdata = NULL;
- ber_free_buf( ber );
-
- return LDAP_SUCCESS;
-}
-#endif
projects / openldap / blobdiff