/* $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 IBM Corporation.
* All rights reserved.
*
const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
void
-slap_get_commit_csn( Operation *op, struct berval *csn )
+slap_get_commit_csn(
+ Operation *op,
+ struct berval *maxcsn,
+ struct berval *curcsn
+)
{
struct slap_csn_entry *csne, *committed_csne = NULL;
int i = 0;
- csn->bv_val = NULL;
- csn->bv_len = 0;
+ if ( maxcsn ) {
+ BER_BVZERO( maxcsn );
+ }
ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
LDAP_TAILQ_FOREACH( csne, op->o_bd->be_pending_csn_list, ce_csn_link ) {
if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) {
+ if ( curcsn ) *curcsn = csne->ce_csn;
csne->ce_state = SLAP_CSN_COMMIT;
break;
}
if ( csne->ce_state == SLAP_CSN_PENDING ) break;
}
- if ( committed_csne ) ber_dupbv_x( csn, committed_csne->ce_csn, op->o_tmpmemctx );
+ if ( committed_csne && maxcsn ) *maxcsn = committed_csne->ce_csn;
ldap_pvt_thread_mutex_unlock( op->o_bd->be_pcl_mutexp );
}
if ( op == NULL ) return;
if ( op->o_bd == NULL ) return;
+#if 0
+ /* it is NULL when we get here from the frontendDB;
+ * alternate fix: initialize frontendDB like all other backends */
+ assert( op->o_bd->be_pcl_mutexp != NULL );
+#endif
+
+ if ( op->o_bd->be_pcl_mutexp == NULL ) return;
+
ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
LDAP_TAILQ_FOREACH( csne, op->o_bd->be_pending_csn_list, ce_csn_link ) {
if ( csne->ce_opid == op->o_opid && csne->ce_connid == op->o_connid ) {
LDAP_TAILQ_REMOVE( op->o_bd->be_pending_csn_list,
csne, ce_csn_link );
- ch_free( csne->ce_csn->bv_val );
- ch_free( csne->ce_csn );
+ ch_free( csne->ce_csn.bv_val );
ch_free( csne );
break;
}
sizeof( struct slap_csn_entry ));
ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
- pending->ce_csn = ber_dupbv( NULL, csn );
+ ber_dupbv( &pending->ce_csn, csn );
pending->ce_connid = op->o_connid;
pending->ce_opid = op->o_opid;
pending->ce_state = SLAP_CSN_PENDING;