X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fctxcsn.c;h=3849034290ab1a0832ed57cf0acd5bff2cc2b81d;hb=9777dc21148eaba94326aa41d851d558d8869b0e;hp=d4d44b9e39b34829331d2846120067d0e1e72dd8;hpb=76dd417dc9ec1b38bb05b9c1df2fa4ba49bc0466;p=openldap

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index d4d44b9e39..3849034290 100644
--- a/servers/slapd/ctxcsn.c
+++ b/servers/slapd/ctxcsn.c
@@ -1,23 +1,18 @@
+/* ctxcsn.c -- Context CSN Management Routines */
 /* $OpenLDAP$ */
-/*
- * Context CSN Management Routines
- */
-/* Copyright (c) 2003 by International Business Machines, Inc.
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 2003 The OpenLDAP Foundation.
+ * Portions Copyright 2003 IBM Corporation.
+ * All rights reserved.
  *
- * International Business Machines, Inc. (hereinafter called IBM) grants
- * permission under its copyrights to use, copy, modify, and distribute this
- * Software with or without fee, provided that the above copyright notice and
- * all paragraphs of this notice appear in all copies, and that the name of IBM
- * not be used in connection with the marketing of any product incorporating
- * the Software or modifications thereof, without specific, written prior
- * permission.
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
  *
- * THE SOFTWARE IS PROVIDED "AS IS", AND IBM DISCLAIMS ALL WARRANTIES,
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
- * PARTICULAR PURPOSE.  IN NO EVENT SHALL IBM BE LIABLE FOR ANY SPECIAL,
- * DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER ARISING
- * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE, EVEN
- * IF IBM IS APPRISED OF THE POSSIBILITY OF SUCH DAMAGES.
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
@@ -26,7 +21,6 @@
 
 #include <ac/string.h>
 #include <ac/socket.h>
-#include <db.h>
 
 #include "ldap_pvt.h"
 #include "lutil.h"
@@ -39,7 +33,7 @@ const struct berval slap_ldapsync_cn_bv = BER_BVC("cn=ldapsync");
 void
 slap_get_commit_csn( Operation *op, struct berval *csn )
 {
-	struct slap_csn_entry *csne = NULL, *committed_csne = NULL;
+	struct slap_csn_entry *csne, *committed_csne = NULL;
 	int i = 0;
 
 	csn->bv_val = NULL;
@@ -48,64 +42,63 @@ slap_get_commit_csn( Operation *op, struct berval *csn )
 	ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
 
 	LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-		if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+		if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+			csne->state = SLAP_CSN_COMMIT;
 			break;
-	}
-
-	if ( csne ) {
-		csne->state = SLAP_CSN_COMMIT;
+		}
 	}
 
 	LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-		if ( csne->state == SLAP_CSN_COMMIT )
-			committed_csne = csne;
-		if ( csne->state == SLAP_CSN_PENDING )
-			break;
+		if ( csne->state == SLAP_CSN_COMMIT ) committed_csne = csne;
+		if ( csne->state == SLAP_CSN_PENDING ) break;
 	}
 
-	ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
-
 	if ( committed_csne ) {
 		ber_dupbv( csn, committed_csne->csn );
 	}
+
+	ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
+
 }
 
 void
 slap_rewind_commit_csn( Operation *op )
 {
-	struct slap_csn_entry *csne = NULL;
+	struct slap_csn_entry *csne;
 
 	ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
 
 	LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-		if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+		if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+			csne->state = SLAP_CSN_PENDING;
 			break;
+		}
 	}
 
-	if ( csne ) {
-		csne->state = SLAP_CSN_PENDING;
-	}
-	
 	ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
 }
 
 void
 slap_graduate_commit_csn( Operation *op )
 {
-	struct slap_csn_entry *csne = NULL;
+	struct slap_csn_entry *csne;
+
+	if ( op == NULL )
+		return;
+
+	if ( op->o_bd == NULL )
+		return;
 
 	ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
 
 	LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, csn_link ) {
-		if ( csne->opid == op->o_opid && csne->connid == op->o_connid )
+		if ( csne->opid == op->o_opid && csne->connid == op->o_connid ) {
+			LDAP_TAILQ_REMOVE( &op->o_bd->be_pending_csn_list, csne, csn_link );
+			ch_free( csne->csn->bv_val );
+			ch_free( csne->csn );
+			ch_free( csne );
 			break;
-	}
-
-	if ( csne ) {
-		LDAP_TAILQ_REMOVE( &op->o_bd->be_pending_csn_list, csne, csn_link );
-		ch_free( csne->csn->bv_val );
-		ch_free( csne->csn );
-		ch_free( csne );
+		}
 	}
 
 	ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
@@ -131,13 +124,14 @@ slap_create_context_csn_entry(
 
 	struct berval bv;
 
-	e = ( Entry * ) ch_calloc( 1, sizeof( Entry ));
-
-	attr_merge( e, slap_schema.si_ad_objectClass, ocbva, NULL );
-
-	attr_merge_one( e, slap_schema.si_ad_structuralObjectClass, &ocbva[1], NULL );
+	e = (Entry *) ch_calloc( 1, sizeof( Entry ));
 
-	attr_merge_one( e, slap_schema.si_ad_cn, (struct berval *)&slap_ldapsync_bv, NULL );
+	attr_merge( e, slap_schema.si_ad_objectClass,
+		ocbva, NULL );
+	attr_merge_one( e, slap_schema.si_ad_structuralObjectClass,
+		&ocbva[1], NULL );
+	attr_merge_one( e, slap_schema.si_ad_cn,
+		(struct berval *)&slap_ldapsync_bv, NULL );
 
 	if ( context_csn ) {
 		attr_merge_one( e, slap_schema.si_ad_contextCSN,
@@ -148,26 +142,13 @@ slap_create_context_csn_entry(
 	bv.bv_len = sizeof("{}")-1;
 	attr_merge_one( e, slap_schema.si_ad_subtreeSpecification, &bv, NULL );
 
-	build_new_dn( &e->e_name, &be->be_nsuffix[0], (struct berval *)&slap_ldapsync_cn_bv, NULL );
+	build_new_dn( &e->e_name, &be->be_nsuffix[0],
+		(struct berval *)&slap_ldapsync_cn_bv, NULL );
 	ber_dupbv( &e->e_nname, &e->e_name );
 
 	return e;
 }
 
-static int
-slap_contextcsn_callback(
-	Operation* op,
-	SlapReply* rs
-)
-{
-	if ( rs->sr_type != REP_SEARCH ) {
-		*((int*)op->o_callback->sc_private) = 0;
-	} else {
-		*((int*)op->o_callback->sc_private) = 1;
-	}
-	return LDAP_SUCCESS;
-}
-
 int
 slap_get_csn(
 	Operation *op,
@@ -177,25 +158,24 @@ slap_get_csn(
 	int manage_ctxcsn
 )
 {
-	struct	slap_csn_entry *pending;
+	struct slap_csn_entry *pending;
 
-	if ( csn == NULL )
-		return LDAP_OTHER;
-
-	if ( manage_ctxcsn ) {
-		pending = (struct slap_csn_entry *) ch_calloc( 1, sizeof( struct slap_csn_entry ));
-	}
+	if ( csn == NULL ) return LDAP_OTHER;
 
 	csn->bv_len = lutil_csnstr( csnbuf, len, 0, 0 );
 	csn->bv_val = csnbuf;
 
 	if ( manage_ctxcsn ) {
+		pending = (struct slap_csn_entry *) ch_calloc( 1,
+			sizeof( struct slap_csn_entry ));
 		ldap_pvt_thread_mutex_lock( &op->o_bd->be_pcl_mutex );
+		ber_dupbv( &op->o_sync_csn, csn );
 		pending->csn = ber_dupbv( NULL, csn );
 		pending->connid = op->o_connid;
 		pending->opid = op->o_opid;
 		pending->state = SLAP_CSN_PENDING;
-		LDAP_TAILQ_INSERT_TAIL( &op->o_bd->be_pending_csn_list, pending, csn_link );
+		LDAP_TAILQ_INSERT_TAIL( &op->o_bd->be_pending_csn_list,
+			pending, csn_link );
 		ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
 	}