refuse illegal values for "threads" (ITS#4433)

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

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 3a24c9f81a27e3b86b48fdc0163d9f58b33d963b..953df87be9dea361b013f1e53916112c602252fc 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2004 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -23,21 +23,7 @@
 
 #include "slap.h"
 #include "back-ldbm.h"
-
-#ifdef SLAPD_LDBM_DYNAMIC
-
-int init_module(int argc, char *argv[]) {
-    BackendInfo bi;
-
-    memset( &bi, '\0', sizeof(bi) );
-    bi.bi_type = "ldbm";
-    bi.bi_init = ldbm_back_initialize;
-
-    backend_add(&bi);
-    return 0;
-}
-
-#endif /* SLAPD_LDBM_DYNAMIC */
+#include <ldap_rq.h>
 
 int
 ldbm_back_initialize(
@@ -46,7 +32,7 @@ ldbm_back_initialize(
 {
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
-               LDAP_CONTROL_VALUESRETURNFILTER,
+               LDAP_CONTROL_X_PERMISSIVE_MODIFY,
                NULL
        };
 
@@ -54,9 +40,7 @@ ldbm_back_initialize(
 
        bi->bi_flags |= 
                SLAP_BFLAG_INCREMENT |
-#ifdef LDBM_SUBENTRIES
                SLAP_BFLAG_SUBENTRIES |
-#endif
                SLAP_BFLAG_ALIASES |
                SLAP_BFLAG_REFERRALS;
 
@@ -187,8 +171,8 @@ ldbm_back_db_init(
        /* delay interval */
        li->li_dbsyncwaitinterval = 5;
 
-       /* flag to notify ldbm_cache_sync_daemon to shut down */
-       li->li_dbshutdown = 0;
+       /* current wait counter */
+       li->li_dbsyncwaitcount = 0;
 
        /* initialize various mutex locks & condition variables */
        ldap_pvt_thread_rdwr_init( &li->li_giant_rwlock );
@@ -207,27 +191,41 @@ ldbm_back_db_open(
 )
 {
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+       int rc;
+
+       rc = alock_open( &li->li_alock_info, "slapd",
+               li->li_directory, ALOCK_UNIQUE );
+       if ( rc == ALOCK_BUSY ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "ldbm_back_db_open: database already in use\n",
+                       0, 0, 0 );
+               return -1;
+       } else if ( rc == ALOCK_RECOVER ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "ldbm_back_db_open: unclean shutdown detected;"
+                       " database may be inconsistent!\n",
+                       0, 0, 0 );
+               rc = alock_recover( &li->li_alock_info );
+       }
+       if ( rc != ALOCK_CLEAN ) {
+               Debug( LDAP_DEBUG_ANY,
+                       "ldbm_back_db_open: alock package is unstable;"
+                       " database may be inconsistent!\n",
+                       0, 0, 0 );
+       }
        li->li_dbenv = ldbm_initialize_env( li->li_directory,
                li->li_dbcachesize, &li->li_envdirok );
 
-       /* sync thread */
-       if ( li->li_dbsyncfreq > 0 )
+       /* If we're in server mode and a sync frequency was set,
+        * submit a task to perform periodic db syncs.
+        */
+       if (( slapMode & SLAP_SERVER_MODE ) && li->li_dbsyncfreq > 0 )
        {
-               int rc;
-               rc = ldap_pvt_thread_create( &li->li_dbsynctid,
-                       0, ldbm_cache_sync_daemon, (void*)be );
-
-               if ( rc != 0 )
-               {
-#ifdef NEW_LOGGING
-                       LDAP_LOG ( BACK_LDBM, ERR, "ldbm_back_db_open: sync "
-                               "ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-#else  
-                       Debug(  LDAP_DEBUG_ANY,
-                               "sync ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
-#endif
-                       return 1;
-               }
+               ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
+               ldap_pvt_runqueue_insert( &slapd_rq, li->li_dbsyncfreq,
+                       ldbm_cache_sync_daemon, be,
+                       "ldbm_cache_sync", be->be_suffix[0].bv_val );
+               ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
        }
 
        return 0;
@@ -257,3 +255,12 @@ ldbm_back_db_destroy(
 
        return 0;
 }
+
+#if SLAPD_LDBM == SLAPD_MOD_DYNAMIC
+
+/* conditionally define the init_module() function */
+SLAP_BACKEND_INIT_MODULE( ldbm )
+
+#endif /* SLAPD_LDBM == SLAPD_MOD_DYNAMIC */
+
+