/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2004 The OpenLDAP Foundation.
+ * Copyright 2003-2005 The OpenLDAP Foundation.
* Portions Copyright 2003 by IBM Corporation.
* Portions Copyright 2003 by Howard Chu, Symas Corporation.
* All rights reserved.
static int syncuuid_cmp( const void *, const void * );
static void avl_ber_bvfree( void * );
-static void syncrepl_del_nonpresent( Operation *, syncinfo_t * );
+static void syncrepl_del_nonpresent( Operation *, syncinfo_t *, BerVarray );
/* callback functions */
static int dn_callback( struct slap_op *, struct slap_rep * );
static AttributeDescription *sync_descs[4];
-struct runqueue_s syncrepl_rq;
-
void
init_syncrepl(syncinfo_t *si)
{
if ( refreshDeletes == 0 && match < 0 &&
err == LDAP_SUCCESS )
{
- syncrepl_del_nonpresent( op, si );
+ syncrepl_del_nonpresent( op, si, NULL );
} else {
avl_free( si->si_presentlist, avl_ber_bvfree );
si->si_presentlist = NULL;
ber_scanf( ber, "tm", &tag, &cookie );
break;
case LDAP_TAG_SYNC_REFRESH_DELETE:
- Debug( LDAP_DEBUG_SYNC,
- "do_syncrep2: %s - %s%s\n",
- "LDAP_RES_INTERMEDIATE",
- "REFRESH_DELETE\n", "\n" );
- si->si_refreshDelete = 1;
case LDAP_TAG_SYNC_REFRESH_PRESENT:
Debug( LDAP_DEBUG_SYNC,
"do_syncrep2: %s - %s%s\n",
si_tag == LDAP_TAG_SYNC_REFRESH_PRESENT ?
"REFRESH_PRESENT" : "REFRESH_DELETE",
"\n" );
- si->si_refreshDelete = 1;
- si->si_refreshPresent = 1;
+ if ( si_tag == LDAP_TAG_SYNC_REFRESH_DELETE ) {
+ si->si_refreshDelete = 1;
+ } else {
+ si->si_refreshPresent = 1;
+ }
ber_scanf( ber, "t{" /*"}"*/, &tag );
if ( ber_peek_tag( ber, &len ) == LDAP_TAG_SYNC_COOKIE )
{
}
ber_scanf( ber, "[W]", &syncUUIDs );
ber_scanf( ber, /*"{"*/ "}" );
- for ( i = 0; !BER_BVISNULL( &syncUUIDs[i] ); i++ ) {
- struct berval *syncuuid_bv;
- syncuuid_bv = ber_dupbv( NULL, &syncUUIDs[i] );
- slap_sl_free( syncUUIDs[i].bv_val,op->o_tmpmemctx );
- avl_insert( &si->si_presentlist,
- (caddr_t) syncuuid_bv,
- syncuuid_cmp, avl_dup_error );
+ if ( refreshDeletes ) {
+ syncrepl_del_nonpresent( op, si, syncUUIDs );
+ ber_bvarray_free_x( syncUUIDs, op->o_tmpmemctx );
+ } else {
+ for ( i = 0; !BER_BVISNULL( &syncUUIDs[i] ); i++ ) {
+ struct berval *syncuuid_bv;
+ syncuuid_bv = ber_dupbv( NULL, &syncUUIDs[i] );
+ slap_sl_free( syncUUIDs[i].bv_val,op->o_tmpmemctx );
+ avl_insert( &si->si_presentlist,
+ (caddr_t) syncuuid_bv,
+ syncuuid_cmp, avl_dup_error );
+ }
+ slap_sl_free( syncUUIDs, op->o_tmpmemctx );
}
- slap_sl_free( syncUUIDs, op->o_tmpmemctx );
break;
default:
Debug( LDAP_DEBUG_ANY,
if ( si->si_refreshPresent == 1 ) {
if ( match < 0 ) {
- syncrepl_del_nonpresent( op, si );
+ syncrepl_del_nonpresent( op, si, NULL );
}
}
return NULL;
}
- if ( slapd_shutdown && si->si_ld ) {
- ldap_get_option( si->si_ld, LDAP_OPT_DESC, &s );
- connection_client_stop( s );
- ldap_unbind( si->si_ld );
- si->si_ld = NULL;
+ if ( slapd_shutdown ) {
+ if ( si->si_ld ) {
+ ldap_get_option( si->si_ld, LDAP_OPT_DESC, &s );
+ connection_client_stop( s );
+ ldap_unbind( si->si_ld );
+ si->si_ld = NULL;
+ }
return NULL;
}
* 3) for Refresh and Success, reschedule to run
* 4) for Persist and Success, reschedule to defer
*/
- ldap_pvt_thread_mutex_lock( &syncrepl_rq.rq_mutex );
+ ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
- if ( ldap_pvt_runqueue_isrunning( &syncrepl_rq, rtask )) {
- ldap_pvt_runqueue_stoptask( &syncrepl_rq, rtask );
+ if ( ldap_pvt_runqueue_isrunning( &slapd_rq, rtask )) {
+ ldap_pvt_runqueue_stoptask( &slapd_rq, rtask );
}
if ( dostop ) {
defer = 0;
}
rtask->interval.tv_sec = si->si_interval;
- ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, defer );
+ ldap_pvt_runqueue_resched( &slapd_rq, rtask, defer );
if ( si->si_retrynum ) {
for ( i = 0; si->si_retrynum_init[i] != -2; i++ ) {
si->si_retrynum[i] = si->si_retrynum_init[i];
}
if ( !si->si_retrynum || si->si_retrynum[i] == -2 ) {
- ldap_pvt_runqueue_remove( &syncrepl_rq, rtask );
+ ldap_pvt_runqueue_remove( &slapd_rq, rtask );
LDAP_STAILQ_REMOVE( &be->be_syncinfo, si, syncinfo_s, si_next );
syncinfo_free( si );
} else if ( si->si_retrynum[i] >= -1 ) {
if ( si->si_retrynum[i] > 0 )
si->si_retrynum[i]--;
rtask->interval.tv_sec = si->si_retryinterval[i];
- ldap_pvt_runqueue_resched( &syncrepl_rq, rtask, 0 );
+ ldap_pvt_runqueue_resched( &slapd_rq, rtask, 0 );
slap_wake_listener();
}
}
- ldap_pvt_thread_mutex_unlock( &syncrepl_rq.rq_mutex );
+ ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
return NULL;
}
goto done;
}
- rc = slap_mods_check( *modlist, 1, &text, txtbuf, textlen, NULL );
+ rc = slap_mods_check( *modlist, &text, txtbuf, textlen, NULL );
if ( rc != LDAP_SUCCESS ) {
Debug( LDAP_DEBUG_ANY, "syncrepl_message_to_entry: mods check (%s)\n",
return rc;
}
+static struct berval generic_filterstr = BER_BVC("(objectclass=*)");
+
/* During a refresh, we may get an LDAP_SYNC_ADD for an already existing
* entry if a previous refresh was interrupted before sending us a new
* context state. We try to compare the new entry to the existing entry
/* if an entry was added via syncrepl_add_glue(),
* it likely has no entryUUID, so the previous
* be_search() doesn't find it. In this case,
- * give syncrepl a chance to modify it. */
+ * give syncrepl a chance to modify it. Also
+ * allow for entries that were recreated with the
+ * same DN but a different entryUUID.
+ */
case LDAP_ALREADY_EXISTS:
if ( retry ) {
Operation op2 = *op;
slap_callback cb2 = { 0 };
op2.o_tag = LDAP_REQ_SEARCH;
- ber_dupbv_x( &op2.o_req_dn,
- &entry->e_name,
- op2.o_tmpmemctx );
- ber_dupbv_x( &op2.o_req_ndn,
- &entry->e_nname,
- op2.o_tmpmemctx );
+ op2.o_req_dn = entry->e_name;
+ op2.o_req_ndn = entry->e_nname;
op2.ors_scope = LDAP_SCOPE_BASE;
op2.ors_attrs = slap_anlist_all_attributes;
op2.ors_attrsonly = 0;
op2.ors_slimit = 1;
op2.ors_tlimit = SLAP_NO_LIMIT;
- f.f_choice = LDAP_FILTER_EQUALITY;
- f.f_ava = &ava;
- ava.aa_desc = slap_schema.si_ad_objectClass;
- ber_dupbv_x( &ava.aa_value,
- &slap_schema.si_oc_glue->soc_cname,
- op2.o_tmpmemctx );
+ f.f_choice = LDAP_FILTER_PRESENT;
+ f.f_desc = slap_schema.si_ad_objectClass;
op2.ors_filter = &f;
- filter2bv_x( &op2, op2.ors_filter,
- &op2.ors_filterstr );
+ op2.ors_filterstr = generic_filterstr;
op2.o_callback = &cb2;
cb2.sc_response = dn_callback;
be->be_search( &op2, &rs2 );
- op2.o_tmpfree( op2.o_req_dn.bv_val,
- op2.o_tmpmemctx );
- op2.o_tmpfree( op2.o_req_ndn.bv_val,
- op2.o_tmpmemctx );
- op2.o_tmpfree( ava.aa_value.bv_val,
- op2.o_tmpmemctx );
- op2.o_tmpfree( op2.ors_filterstr.bv_val,
- op2.o_tmpmemctx );
-
retry = 0;
goto retry_add;
}
BER_BVNULL
};
+#define NP_DELETE_ONE 2
+
static void
syncrepl_del_nonpresent(
Operation *op,
- syncinfo_t *si )
+ syncinfo_t *si,
+ BerVarray uuids )
{
Backend* be = op->o_bd;
slap_callback cb = { NULL };
op->ors_deref = LDAP_DEREF_NEVER;
op->o_time = slap_get_time();
op->ors_tlimit = SLAP_NO_LIMIT;
- op->ors_slimit = SLAP_NO_LIMIT;
- memset( &an[0], 0, 2 * sizeof( AttributeName ) );
- an[0].an_name = slap_schema.si_ad_entryUUID->ad_cname;
- an[0].an_desc = slap_schema.si_ad_entryUUID;
- op->ors_attrs = an;
- op->ors_attrsonly = 0;
- op->ors_filter = str2filter_x( op, si->si_filterstr.bv_val );
- op->ors_filterstr = si->si_filterstr;
+ if ( uuids ) {
+ Filter uf;
+ AttributeAssertion eq;
+ int i;
- op->o_nocaching = 1;
- op->o_managedsait = SLAP_CONTROL_NONE;
+ op->ors_attrsonly = 1;
+ op->ors_attrs = slap_anlist_no_attrs;
+ op->ors_limit = NULL;
+ op->ors_filter = &uf;
+ op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
- if ( limits_check( op, &rs_search ) == 0 ) {
- rc = be->be_search( op, &rs_search );
+ uf.f_ava = &eq;
+ uf.f_av_desc = slap_schema.si_ad_entryUUID;
+ uf.f_next = NULL;
+ uf.f_choice = LDAP_FILTER_EQUALITY;
+ si->si_refreshDelete |= NP_DELETE_ONE;
+
+ for (i=0; uuids[i].bv_val; i++) {
+ op->ors_slimit = 1;
+ uf.f_av_value = uuids[i];
+ rc = be->be_search( op, &rs_search );
+ }
+ si->si_refreshDelete ^= NP_DELETE_ONE;
+ } else {
+ memset( &an[0], 0, 2 * sizeof( AttributeName ) );
+ an[0].an_name = slap_schema.si_ad_entryUUID->ad_cname;
+ an[0].an_desc = slap_schema.si_ad_entryUUID;
+ op->ors_attrs = an;
+ op->ors_slimit = SLAP_NO_LIMIT;
+ op->ors_attrsonly = 0;
+ op->ors_filter = str2filter_x( op, si->si_filterstr.bv_val );
+ op->ors_filterstr = si->si_filterstr;
+ op->o_nocaching = 1;
+ op->o_managedsait = SLAP_CONTROL_NONE;
+
+ if ( limits_check( op, &rs_search ) == 0 ) {
+ rc = be->be_search( op, &rs_search );
+ }
+ if ( op->ors_filter ) filter_free_x( op, op->ors_filter );
}
op->o_managedsait = SLAP_CONTROL_NONCRITICAL;
op->o_nocaching = 0;
- if ( op->ors_filter ) filter_free_x( op, op->ors_filter );
-
if ( !LDAP_LIST_EMPTY( &si->si_nonpresentlist ) ) {
np_list = LDAP_LIST_FIRST( &si->si_nonpresentlist );
while ( np_list != NULL ) {
si->si_presentlist = NULL;
} else if ( rs->sr_type == REP_SEARCH ) {
- a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryUUID );
+ if ( !(si->si_refreshDelete & NP_DELETE_ONE )) {
+ a = attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_entryUUID );
- if ( a == NULL ) return 0;
+ if ( a == NULL ) return 0;
- present_uuid = avl_find( si->si_presentlist, &a->a_nvals[0],
- syncuuid_cmp );
+ present_uuid = avl_find( si->si_presentlist, &a->a_nvals[0],
+ syncuuid_cmp );
+ }
if ( present_uuid == NULL ) {
np_entry = (struct nonpresent_entry *)
projects / openldap / blobdiff