add logs; fix bug in group/dn selection logic

[openldap] / servers / slapd / ctxcsn.c

diff --git a/servers/slapd/ctxcsn.c b/servers/slapd/ctxcsn.c
index 2efce4c6cccbd93be1ed8efaf51930c2733f4c40..ab1061978edca72b40f496c4fe57e93dfe931815 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 The OpenLDAP Foundation.
+ * Copyright 2003-2004 The OpenLDAP Foundation.
  * Portions Copyright 2003 IBM Corporation.
  * All rights reserved.
  *
@@ -33,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;
@@ -41,66 +41,58 @@ 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 ) break;
+       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 ) {
+                       csne->ce_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;
+       LDAP_TAILQ_FOREACH( csne, &op->o_bd->be_pending_csn_list, ce_csn_link ) {
+               if ( csne->ce_state == SLAP_CSN_COMMIT ) committed_csne = csne;
+               if ( csne->ce_state == SLAP_CSN_PENDING ) break;
        }
 
+       if ( committed_csne ) ber_dupbv( csn, committed_csne->ce_csn );
        ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
-
-       if ( committed_csne ) {
-               ber_dupbv( csn, committed_csne->csn );
-       }
 }
 
 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 ) break;
+       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 ) {
+                       csne->ce_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;
-
-       if ( op == NULL )
-               return;
+       struct slap_csn_entry *csne;
 
-       if ( op->o_bd == NULL )
-               return;
+       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 ) 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_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 );
+                       break;
+               }
        }
 
        ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
@@ -118,8 +110,7 @@ static struct berval ocbva[] = {
 Entry *
 slap_create_context_csn_entry(
        Backend *be,
-       struct berval *context_csn
-)
+       struct berval *context_csn )
 {
        Entry* e;
        int rc;
@@ -151,28 +142,13 @@ slap_create_context_csn_entry(
        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,
        char *csnbuf,
        int     len,
        struct berval *csn,
-       int manage_ctxcsn
-)
+       int manage_ctxcsn )
 {
        struct slap_csn_entry *pending;
 
@@ -186,12 +162,12 @@ slap_get_csn(
                        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;
+               pending->ce_csn = ber_dupbv( NULL, csn );
+               pending->ce_connid = op->o_connid;
+               pending->ce_opid = op->o_opid;
+               pending->ce_state = SLAP_CSN_PENDING;
                LDAP_TAILQ_INSERT_TAIL( &op->o_bd->be_pending_csn_list,
-                       pending, csn_link );
+                       pending, ce_csn_link );
                ldap_pvt_thread_mutex_unlock( &op->o_bd->be_pcl_mutex );
        }