Add a default case with assert() just in case.

[openldap] / servers / slapd / back-ldbm / init.c

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 72eae524373d2f0dd758277860ff07fccea2fcb4..1fe1335666f1de3fcd9f0662710ded8a981b3aca 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -1,7 +1,7 @@
 /* init.c - initialize ldbm backend */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -43,7 +43,7 @@ ldbm_back_initialize(
        bi->bi_controls = controls;
 
        bi->bi_open = ldbm_back_open;
-       bi->bi_config = ldbm_back_config;
+       bi->bi_config = NULL;
        bi->bi_close = ldbm_back_close;
        bi->bi_destroy = ldbm_back_destroy;
 
@@ -54,14 +54,14 @@ ldbm_back_initialize(
        bi->bi_db_destroy = ldbm_back_db_destroy;
 
        bi->bi_op_bind = ldbm_back_bind;
-       bi->bi_op_unbind = ldbm_back_unbind;
+       bi->bi_op_unbind = 0;
        bi->bi_op_search = ldbm_back_search;
        bi->bi_op_compare = ldbm_back_compare;
        bi->bi_op_modify = ldbm_back_modify;
        bi->bi_op_modrdn = ldbm_back_modrdn;
        bi->bi_op_add = ldbm_back_add;
        bi->bi_op_delete = ldbm_back_delete;
-       bi->bi_op_abandon = ldbm_back_abandon;
+       bi->bi_op_abandon = 0;
 
        bi->bi_extended = ldbm_back_extended;
 
@@ -69,6 +69,7 @@ ldbm_back_initialize(
        bi->bi_acl_group = ldbm_back_group;
        bi->bi_acl_attribute = ldbm_back_attribute;
        bi->bi_chk_referrals = ldbm_back_referrals;
+       bi->bi_operational = ldbm_back_operational;
 
        /*
         * hooks for slap tools
@@ -85,14 +86,6 @@ ldbm_back_initialize(
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
 
-       {
-               struct ldbm_backend_info *lbi = malloc(
-                       sizeof( struct ldbm_backend_info ) );
-
-               bi->bi_private = lbi;
-               lbi->lbi_directory = NULL;
-       }
-
        return 0;
 }
 
@@ -111,11 +104,8 @@ ldbm_back_open(
 {
        int rc;
 
-       struct ldbm_backend_info *lbi
-               = (struct ldbm_backend_info *) bi->bi_private;
-
        /* initialize the underlying database system */
-       rc = ldbm_initialize( lbi->lbi_directory );
+       rc = ldbm_initialize( NULL );
        return rc;
 }
 
@@ -136,6 +126,9 @@ ldbm_back_db_init(
 {
        struct ldbminfo *li;
 
+       /* indicate system schema supported */
+       be->be_flags |= SLAP_BFLAG_ALIASES|SLAP_BFLAG_REFERRALS;
+
        /* allocate backend-database-specific stuff */
        li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) );
 
@@ -166,6 +159,18 @@ ldbm_back_db_init(
        /* envdirok is turned on by ldbm_initialize_env if DB3 */
        li->li_envdirok = 0;
 
+       /* syncfreq is 0 if disabled, or # seconds */
+       li->li_dbsyncfreq = 0;
+
+       /* wait up to dbsyncwaitn times if server is busy */
+       li->li_dbsyncwaitn = 12;
+
+       /* delay interval */
+       li->li_dbsyncwaitinterval = 5;
+
+       /* flag to notify ldbm_cache_sync_daemon to shut down */
+       li->li_dbshutdown = 0;
+
        /* initialize various mutex locks & condition variables */
        ldap_pvt_thread_mutex_init( &li->li_root_mutex );
        ldap_pvt_thread_mutex_init( &li->li_add_mutex );
@@ -185,8 +190,24 @@ ldbm_back_db_open(
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       li->li_dbenv = ldbm_initialize_env(li->li_directory,
-               li->li_dbcachesize, &li->li_envdirok);
+       li->li_dbenv = ldbm_initialize_env( li->li_directory,
+               li->li_dbcachesize, &li->li_envdirok );
+
+       /* sync thread */
+       if ( li->li_dbsyncfreq > 0 )
+       {
+               int rc;
+               rc = ldap_pvt_thread_create( &li->li_dbsynctid,
+                       0, ldbm_cache_sync_daemon, (void*)be );
+
+               if ( rc != 0 )
+               {
+                       Debug(  LDAP_DEBUG_ANY,
+                               "sync ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
+                       return 1;
+               }
+       }
+
        return 0;
 }
 
@@ -198,7 +219,8 @@ ldbm_back_db_destroy(
        /* should free/destroy every in be_private */
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
 
-       ldbm_shutdown_env(li->li_dbenv);
+       if (li->li_dbenv)
+           ldbm_shutdown_env(li->li_dbenv);
 
        free( li->li_directory );
        attr_index_destroy( li->li_attrs );