/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2003-2005 The OpenLDAP Foundation.
+ * Copyright 2003-2007 The OpenLDAP Foundation.
* Portions Copyright 2003 IBM Corporation.
* All rights reserved.
*
const struct berval slap_ldapsync_bv = BER_BVC("ldapsync");
const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
+int slap_serverID;
void
slap_get_commit_csn(
Operation *op,
- struct berval *maxcsn,
- struct berval *curcsn
+ struct berval *maxcsn
)
{
struct slap_csn_entry *csne, *committed_csne = NULL;
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;
}
struct berval bv;
- e = (Entry *) ch_calloc( 1, sizeof( Entry ));
+ e = entry_alloc();
attr_merge( e, slap_schema.si_ad_objectClass,
ocbva, NULL );
ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
ber_dupbv( &pending->ce_csn, csn );
- ber_dupbv_x( &op->o_csn, &pending->ce_csn, op->o_tmpmemctx );
+ ber_bvreplace_x( &op->o_csn, &pending->ce_csn, op->o_tmpmemctx );
pending->ce_connid = op->o_connid;
pending->ce_opid = op->o_opid;
pending->ce_state = SLAP_CSN_PENDING;
{
if ( csn == NULL ) return LDAP_OTHER;
-#ifndef HAVE_GMTIME_R
+ /* gmtime doesn't always need a mutex, but lutil_csnstr does */
ldap_pvt_thread_mutex_lock( &gmtime_mutex );
-#endif
- csn->bv_len = lutil_csnstr( csn->bv_val, csn->bv_len, 0, 0 );
-#ifndef HAVE_GMTIME_R
+ csn->bv_len = lutil_csnstr( csn->bv_val, csn->bv_len, slap_serverID, 0 );
ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
-#endif
if ( manage_ctxcsn )
slap_queue_csn( op, csn );