Add trickle-sync for quick mode

[openldap] / servers / slapd / backend.c

diff --git a/servers/slapd/backend.c b/servers/slapd/backend.c
index f7f214e1874e4e9b262122f5a098187b1d6e90be..b5d005b18083668258b35d1ea15066bc60df4089 100644 (file)
--- a/servers/slapd/backend.c
+++ b/servers/slapd/backend.c
@@ -418,7 +418,7 @@ backend_stopdown_one( BackendDB *bd )
 void backend_destroy_one( BackendDB *bd, int dynamic )
 {
        if ( dynamic ) {
-               LDAP_STAILQ_REMOVE(&backendDB, bd, slap_backend_db, be_next );
+               LDAP_STAILQ_REMOVE(&backendDB, bd, BackendDB, be_next );
        }
 
        if ( bd->be_syncinfo ) {
@@ -440,16 +440,6 @@ void backend_destroy_one( BackendDB *bd, int dynamic )
        }
        acl_destroy( bd->be_acl, frontendDB->be_acl );
        limits_destroy( bd->be_limits );
-       if ( bd->be_replogfile ) {
-               ch_free( bd->be_replogfile );
-       }
-       if ( bd->be_replica_argsfile ) {
-               ch_free( bd->be_replica_argsfile );
-       }
-       if ( bd->be_replica_pidfile ) {
-               ch_free( bd->be_replica_pidfile );
-       }
-       destroy_replica_info( bd );
        if ( !BER_BVISNULL( &bd->be_update_ndn ) ) {
                ch_free( bd->be_update_ndn.bv_val );
        }
@@ -500,17 +490,6 @@ int backend_destroy(void)
                        free( bd->be_rootpw.bv_val );
                }
                acl_destroy( bd->be_acl, frontendDB->be_acl );
-
-               if ( bd->be_replogfile != NULL ) {
-                       free( bd->be_replogfile );
-               }
-               if ( bd->be_replica_argsfile ) {
-                       ch_free( bd->be_replica_argsfile );
-               }
-               if ( bd->be_replica_pidfile ) {
-                       ch_free( bd->be_replica_pidfile );
-               }
-               assert( bd->be_replica == NULL );
        }
 
        return 0;
@@ -560,7 +539,7 @@ backend_db_move(
        int idx
 )
 {
-       LDAP_STAILQ_REMOVE(&backendDB, be, slap_backend_db, be_next);
+       LDAP_STAILQ_REMOVE(&backendDB, be, BackendDB, be_next);
        backend_db_insert(be, idx);
 }
 
@@ -614,7 +593,7 @@ backend_db_init(
                fprintf( stderr, "database init failed (%s)\n", type );
                /* If we created and linked this be, remove it and free it */
                if ( !b0 ) {
-                       LDAP_STAILQ_REMOVE(&backendDB, be, slap_backend_db, be_next);
+                       LDAP_STAILQ_REMOVE(&backendDB, be, BackendDB, be_next);
                        ch_free( be );
                        be = NULL;
                        nbackends--;