/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2006 The OpenLDAP Foundation.
* Portions Copyright 2003 by IBM Corporation.
* Portions Copyright 2003 by Howard Chu, Symas Corporation.
* All rights reserved.
Modifications**,int, struct berval*,
struct sync_cookie *,
struct berval * );
-static void syncrepl_updateCookie(
+static int syncrepl_updateCookie(
syncinfo_t *, Operation *, struct berval *,
struct sync_cookie * );
static struct berval * slap_uuidstr_from_normalized(
int rc, err, i;
ber_len_t len;
- int rc_efree = 1;
-
struct berval *psub;
Modifications *modlist = NULL;
slap_parse_sync_cookie( &syncCookie, NULL );
}
}
+ rc = 0;
if ( si->si_syncdata && si->si_logstate == SYNCLOG_LOGGING ) {
- entry = NULL;
modlist = NULL;
- if ( syncrepl_message_to_op( si, op, msg ) == LDAP_SUCCESS &&
+ if (( rc = syncrepl_message_to_op( si, op, msg )) == LDAP_SUCCESS &&
!BER_BVISNULL( &syncCookie.ctxcsn ) ) {
- syncrepl_updateCookie( si, op, psub, &syncCookie );
+ rc = syncrepl_updateCookie( si, op, psub, &syncCookie );
}
- } else if ( syncrepl_message_to_entry( si, op, msg,
- &modlist, &entry, syncstate ) == LDAP_SUCCESS ) {
- rc_efree = syncrepl_entry( si, op, entry, &modlist,
- syncstate, &syncUUID, &syncCookie_req, &syncCookie.ctxcsn );
- if ( !BER_BVISNULL( &syncCookie.ctxcsn ) )
- {
- syncrepl_updateCookie( si, op, psub, &syncCookie );
+ } else if (( rc = syncrepl_message_to_entry( si, op, msg,
+ &modlist, &entry, syncstate )) == LDAP_SUCCESS ) {
+ if (( rc = syncrepl_entry( si, op, entry, &modlist,
+ syncstate, &syncUUID, &syncCookie_req,
+ &syncCookie.ctxcsn )) == LDAP_SUCCESS &&
+ !BER_BVISNULL( &syncCookie.ctxcsn ) ) {
+ rc = syncrepl_updateCookie( si, op, psub, &syncCookie );
}
}
ldap_controls_free( rctrls );
if ( modlist ) {
slap_mods_free( modlist, 1 );
}
- if ( rc_efree && entry ) {
- entry_free( entry );
- }
- entry = NULL;
+ if ( rc )
+ goto done;
break;
case LDAP_RES_SEARCH_REFERENCE:
if ( !BER_BVISNULL( &syncCookie.ctxcsn ) &&
match < 0 && err == LDAP_SUCCESS )
{
- syncrepl_updateCookie( si, op, psub, &syncCookie );
+ rc = syncrepl_updateCookie( si, op, psub, &syncCookie );
}
if ( rctrls ) {
ldap_controls_free( rctrls );
if ( !BER_BVISNULL( &syncCookie.ctxcsn ) &&
match < 0 )
{
- syncrepl_updateCookie( si, op, psub, &syncCookie);
+ rc = syncrepl_updateCookie( si, op, psub, &syncCookie);
}
if ( si->si_refreshPresent == 1 ) {
op->orr_newrdn = prdn;
op->orr_nnewrdn = nrdn;
op->orr_deleteoldrdn = deleteOldRdn;
+ op->orr_modlist = NULL;
+ if ( slap_modrdn2mods( op, &rs ))
+ goto done;
rc = op->o_bd->be_modrdn( op, &rs );
+ slap_mods_free( op->orr_modlist, 1 );
break;
case LDAP_REQ_DELETE:
rc = op->o_bd->be_delete( op, &rs );
}
e = ( Entry * ) ch_calloc( 1, sizeof( Entry ) );
- *entry = e;
e->e_name = op->o_req_dn;
e->e_nname = op->o_req_ndn;
if ( rc != LDAP_SUCCESS ) {
if ( e ) {
entry_free( e );
- *entry = e = NULL;
+ e = NULL;
}
}
+ *entry = e;
return rc;
}
AttributeAssertion ava = { NULL, BER_BVNULL };
#endif
int rc = LDAP_SUCCESS;
- int ret = LDAP_SUCCESS;
struct berval pdn = BER_BVNULL;
dninfo dni = {0};
case LDAP_SYNC_MODIFY:
{
Attribute *a = attr_find( entry->e_attrs, slap_schema.si_ad_entryCSN );
- if ( a )
+ if ( a ) {
+ /* FIXME: op->o_csn is assumed to be
+ * on the thread's slab; this needs
+ * to be cleared ASAP.
+ * What happens if already present?
+ */
+ assert( BER_BVISNULL( &op->o_csn ) );
op->o_csn = a->a_vals[0];
+ }
}
retry_add:;
if ( BER_BVISNULL( &dni.dn )) {
switch ( rs_add.sr_err ) {
case LDAP_SUCCESS:
be_entry_release_w( op, entry );
- ret = 0;
+ entry = NULL;
break;
case LDAP_REFERRAL:
/* we assume that LDAP_NO_SUCH_OBJECT is returned
* only if the suffix entry is not present */
case LDAP_NO_SUCH_OBJECT:
- syncrepl_add_glue( op, entry );
- ret = 0;
+ rc = syncrepl_add_glue( op, entry );
+ entry = NULL;
break;
/* if an entry was added via syncrepl_add_glue(),
cb2.sc_response = dn_callback;
cb2.sc_private = &dni;
- be->be_search( &op2, &rs2 );
+ rc = be->be_search( &op2, &rs2 );
+ if ( rc ) goto done;
retry = 0;
goto retry_add;
Debug( LDAP_DEBUG_ANY,
"syncrepl_entry : be_add failed (%d)\n",
rs_add.sr_err, 0, 0 );
- ret = 1;
break;
}
goto done;
dnParent( &dni.ndn, &noldp );
dnParent( &entry->e_nname, &nnewp );
- if ( !dn_match( &noldp, &newp )) {
+ if ( !dn_match( &noldp, &nnewp )) {
dnParent( &entry->e_name, &newp );
op->orr_newSup = &newp;
op->orr_nnewSup = &nnewp;
}
op->orr_deleteoldrdn = 0;
+ op->orr_modlist = NULL;
+ if (( rc = slap_modrdn2mods( op, &rs_modify ))) {
+ goto done;
+ }
rc = be->be_modrdn( op, &rs_modify );
+ slap_mods_free( op->orr_modlist, 1 );
Debug( LDAP_DEBUG_SYNC,
"syncrepl_entry: %s (%d)\n",
"be_modrdn", rc, 0 );
op->o_req_dn = entry->e_name;
op->o_req_ndn = entry->e_nname;
} else {
- ret = 1;
goto done;
}
}
rs_modify.sr_err, 0, 0 );
}
}
- ret = 1;
goto done;
case LDAP_SYNC_DELETE :
if ( !BER_BVISNULL( &dni.dn )) {
}
}
}
- ret = 0;
goto done;
default :
Debug( LDAP_DEBUG_ANY,
"syncrepl_entry : unknown syncstate\n", 0, 0, 0 );
- ret = 1;
goto done;
}
-done :
+done:
if ( !BER_BVISNULL( &syncUUID_strrep ) ) {
slap_sl_free( syncUUID_strrep.bv_val, op->o_tmpmemctx );
BER_BVZERO( &syncUUID_strrep );
if ( !BER_BVISNULL( &dni.dn ) ) {
op->o_tmpfree( dni.dn.bv_val, op->o_tmpmemctx );
}
+ if ( entry )
+ entry_free( entry );
BER_BVZERO( &op->o_csn );
- return ret;
+ return rc;
}
static struct berval gcbva[] = {
}
slap_graduate_commit_csn( op );
+
+ op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
+ BER_BVZERO( &op->o_csn );
}
return;
}
-void
+int
syncrepl_add_glue(
Operation* op,
Entry *e )
} else {
/* incl. ALREADY EXIST */
entry_free( glue );
+ if ( rs_add.sr_err != LDAP_ALREADY_EXISTS ) {
+ entry_free( e );
+ return rc;
+ }
}
/* Move to next child */
entry_free( e );
}
- return;
+ return rc;
}
-static void
+static int
syncrepl_updateCookie(
syncinfo_t *si,
Operation *op,
slap_callback cb = { NULL };
SlapReply rs_modify = {REP_RESULT};
- slap_sync_cookie_free( &si->si_syncCookie, 0 );
- slap_dup_sync_cookie( &si->si_syncCookie, syncCookie );
-
mod.sml_op = LDAP_MOD_REPLACE;
mod.sml_desc = slap_schema.si_ad_contextCSN;
mod.sml_type = mod.sml_desc->ad_cname;
mod.sml_values = vals;
- vals[0] = si->si_syncCookie.ctxcsn;
- vals[1].bv_val = NULL;
- vals[1].bv_len = 0;
+ vals[0] = syncCookie->ctxcsn;
+ BER_BVZERO( &vals[1] );
- slap_queue_csn( op, &si->si_syncCookie.ctxcsn );
+ slap_queue_csn( op, &syncCookie->ctxcsn );
op->o_tag = LDAP_REQ_MODIFY;
rc = be->be_modify( op, &rs_modify );
op->o_msgid = 0;
- if ( rs_modify.sr_err != LDAP_SUCCESS ) {
+ if ( rs_modify.sr_err == LDAP_SUCCESS ) {
+ slap_sync_cookie_free( &si->si_syncCookie, 0 );
+ slap_dup_sync_cookie( &si->si_syncCookie, syncCookie );
+ } else {
Debug( LDAP_DEBUG_ANY,
"be_modify failed (%d)\n", rs_modify.sr_err, 0, 0 );
}
slap_graduate_commit_csn( op );
- return;
+ op->o_tmpfree( op->o_csn.bv_val, op->o_tmpmemctx );
+ BER_BVZERO( &op->o_csn );
+
+ return rc;
}
static int
void
syncinfo_free( syncinfo_t *sie )
{
+ /* re-fetch it, in case it was already removed */
+ sie->si_re = ldap_pvt_runqueue_find( &slapd_rq, do_syncrepl, sie );
+ if ( sie->si_re ) {
+ if ( ldap_pvt_runqueue_isrunning( &slapd_rq, sie->si_re ) )
+ ldap_pvt_runqueue_stoptask( &slapd_rq, sie->si_re );
+ ldap_pvt_runqueue_remove( &slapd_rq, sie->si_re );
+ }
+
ldap_pvt_thread_mutex_destroy( &sie->si_mutex );
bindconf_free( &sie->si_bindconf );
if ( strcasecmp( val, "unlimited" ) == 0 ) {
si->si_slimit = 0;
- } else if ( lutil_atoi( &si->si_slimit, val ) != 0 || val < 0 ) {
+ } else if ( lutil_atoi( &si->si_slimit, val ) != 0 || si->si_slimit < 0 ) {
snprintf( c->msg, sizeof( c->msg ),
"invalid size limit value \"%s\".\n",
val );
if ( strcasecmp( val, "unlimited" ) == 0 ) {
si->si_tlimit = 0;
- } else if ( lutil_atoi( &si->si_tlimit, val ) != 0 || val < 0 ) {
+ } else if ( lutil_atoi( &si->si_tlimit, val ) != 0 || si->si_tlimit < 0 ) {
snprintf( c->msg, sizeof( c->msg ),
"invalid time limit value \"%s\".\n",
val );
struct re_s *re;
if ( c->be->be_syncinfo ) {
- re = c->be->be_syncinfo->si_re;
- if ( re ) {
- if ( ldap_pvt_runqueue_isrunning( &slapd_rq, re ) )
- ldap_pvt_runqueue_stoptask( &slapd_rq, re );
- ldap_pvt_runqueue_remove( &slapd_rq, re );
- }
syncinfo_free( c->be->be_syncinfo );
c->be->be_syncinfo = NULL;
}
projects / openldap / blobdiff