ITS#8100 fixes for delta-syncrepl with empty accesslog

[openldap] / servers / slapd / overlays / accesslog.c

diff --git a/servers/slapd/overlays/accesslog.c b/servers/slapd/overlays/accesslog.c
index 50aaa116e873f6730e330d0bf40cd86331e997ce..faa94d49693eff2a8d1d1b23024300e8c7ec2fdd 100644 (file)
--- a/servers/slapd/overlays/accesslog.c
+++ b/servers/slapd/overlays/accesslog.c
@@ -1515,6 +1515,11 @@ static int accesslog_response(Operation *op, SlapReply *rs) {
                                break;
                        }
                }
+#ifdef RMUTEX_DEBUG
+               Debug( LDAP_DEBUG_SYNC,
+                       "accesslog_response: unlocking rmutex for tid %x\n",
+                       op->o_tid, 0, 0 );
+#endif
                ldap_pvt_thread_rmutex_unlock( &li->li_op_rmutex, op->o_tid );
        }
 
@@ -1938,7 +1943,7 @@ accesslog_mod_cleanup( Operation *op, SlapReply *rs )
 
        op->o_tmpfree( sc, op->o_tmpmemctx );
 
-       if ( on ) {
+       if ( on && rs->sr_err != LDAP_SUCCESS ) {
                BackendInfo *bi = op->o_bd->bd_info;
                op->o_bd->bd_info = (BackendInfo *)on;
                accesslog_response( op, rs );
@@ -1989,13 +1994,23 @@ accesslog_op_mod( Operation *op, SlapReply *rs )
        }
                        
        if ( doit ) {
-               slap_callback *cb = op->o_tmpcalloc( 1, sizeof( slap_callback ), op->o_tmpmemctx ), *cb2;
+               slap_callback *cb = op->o_tmpcalloc( 1, sizeof( slap_callback ), op->o_tmpmemctx );
                cb->sc_cleanup = accesslog_mod_cleanup;
                cb->sc_private = on;
-               for ( cb2 = op->o_callback; cb2->sc_next; cb2 = cb2->sc_next );
-               cb2->sc_next = cb;
+               cb->sc_next = op->o_callback;
+               op->o_callback = cb;
 
+#ifdef RMUTEX_DEBUG
+               Debug( LDAP_DEBUG_SYNC,
+                       "accesslog_op_mod: locking rmutex for tid %x\n",
+                       op->o_tid, 0, 0 );
+#endif
                ldap_pvt_thread_rmutex_lock( &li->li_op_rmutex, op->o_tid );
+#ifdef RMUTEX_DEBUG
+               Debug( LDAP_DEBUG_STATS,
+                       "accesslog_op_mod: locked rmutex for tid %x\n",
+                       op->o_tid, 0, 0 );
+#endif
                if ( li->li_oldf && ( op->o_tag == LDAP_REQ_DELETE ||
                        op->o_tag == LDAP_REQ_MODIFY ||
                        ( op->o_tag == LDAP_REQ_MODRDN && li->li_oldattrs )))
@@ -2283,6 +2298,7 @@ accesslog_db_root(
                db = *li->li_db;
                op->o_bd = &db;
 
+               op->o_tag = LDAP_REQ_ADD;
                op->ora_e = e;
                op->o_req_dn = e->e_name;
                op->o_req_ndn = e->e_nname;