fix typo (ITS#4784)

[openldap] / servers / slapd / ctxcsn.c

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 408ee66838d796f916e667aff634b37718e6147f..0cab941536b648fec82e1431db46a74c6e27c841 100644 (file)
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -2,7 +2,7 @@
 /* $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 IBM Corporation.
  * All rights reserved.
  *
@@ -32,12 +32,10 @@ const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
 void
 slap_get_commit_csn(
        Operation *op,
-       struct berval *maxcsn,
-       struct berval *curcsn
+       struct berval *maxcsn
 )
 {
        struct slap_csn_entry *csne, *committed_csne = NULL;
-       int i = 0;
 
        if ( maxcsn ) {
                BER_BVZERO( maxcsn );
@@ -47,7 +45,6 @@ slap_get_commit_csn(
 
        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;
                }
@@ -101,6 +98,9 @@ slap_graduate_commit_csn( Operation *op )
                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 );
+                       if ( op->o_csn.bv_val == csne->ce_csn.bv_val ) {
+                               BER_BVZERO( &op->o_csn );
+                       }
                        ch_free( csne->ce_csn.bv_val );
                        ch_free( csne );
                        break;
@@ -125,11 +125,10 @@ slap_create_context_csn_entry(
        struct berval *context_csn )
 {
        Entry* e;
-       int rc;
 
        struct berval bv;
 
-       e = (Entry *) ch_calloc( 1, sizeof( Entry ));
+       e = entry_alloc();
 
        attr_merge( e, slap_schema.si_ad_objectClass,
                ocbva, NULL );
@@ -165,6 +164,7 @@ slap_queue_csn(
        ldap_pvt_thread_mutex_lock( op->o_bd->be_pcl_mutexp );
 
        ber_dupbv( &pending->ce_csn, csn );
+       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;
@@ -176,8 +176,6 @@ slap_queue_csn(
 int
 slap_get_csn(
        Operation *op,
-       char *csnbuf,
-       int     len,
        struct berval *csn,
        int manage_ctxcsn )
 {
@@ -186,11 +184,10 @@ slap_get_csn(
 #ifndef HAVE_GMTIME_R
        ldap_pvt_thread_mutex_lock( &gmtime_mutex );
 #endif
-       csn->bv_len = lutil_csnstr( csnbuf, len, 0, 0 );
+       csn->bv_len = lutil_csnstr( csn->bv_val, csn->bv_len, 0, 0 );
 #ifndef HAVE_GMTIME_R
        ldap_pvt_thread_mutex_unlock( &gmtime_mutex );
 #endif
-       csn->bv_val = csnbuf;
 
        if ( manage_ctxcsn )
                slap_queue_csn( op, csn );