]> git.sur5r.net Git - openldap/blobdiff - servers/slapd/back-ldbm/init.c
list permissive in supported controls (ITS#3453)
[openldap] / servers / slapd / back-ldbm / init.c
index e213feade4b3ed261534c913532328903656a150..25a151574528d7f999bea5de524661b4a5486880 100644 (file)
@@ -1,8 +1,17 @@
 /* init.c - initialize ldbm backend */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
- * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
+/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
+ *
+ * Copyright 1998-2004 The OpenLDAP Foundation.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted only as authorized by the OpenLDAP
+ * Public License.
+ *
+ * A copy of this license is available in the file LICENSE in the
+ * top-level directory of the distribution or, alternatively, at
+ * <http://www.OpenLDAP.org/license.html>.
  */
 
 #include "portable.h"
 #include "slap.h"
 #include "back-ldbm.h"
 
-#ifdef SLAPD_LDBM_DYNAMIC
-
-int back_ldbm_LTX_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 */
-
 int
 ldbm_back_initialize(
     BackendInfo        *bi
@@ -37,14 +31,25 @@ ldbm_back_initialize(
 {
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
-       /*      LDAP_CONTROL_X_CHANGE_PASSWD, */
+               LDAP_CONTROL_VALUESRETURNFILTER,
+#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
+               LDAP_CONTROL_X_PERMISSIVE_MODIFY,
+#endif
                NULL
        };
 
        bi->bi_controls = controls;
 
+       bi->bi_flags |= 
+               SLAP_BFLAG_INCREMENT |
+#ifdef LDBM_SUBENTRIES
+               SLAP_BFLAG_SUBENTRIES |
+#endif
+               SLAP_BFLAG_ALIASES |
+               SLAP_BFLAG_REFERRALS;
+
        bi->bi_open = ldbm_back_open;
-       bi->bi_config = 0;
+       bi->bi_config = NULL;
        bi->bi_close = ldbm_back_close;
        bi->bi_destroy = ldbm_back_destroy;
 
@@ -55,19 +60,22 @@ 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;
 
        bi->bi_entry_release_rw = ldbm_back_entry_release_rw;
-       bi->bi_acl_group = ldbm_back_group;
+       bi->bi_entry_get_rw = ldbm_back_entry_get;
+       bi->bi_chk_referrals = ldbm_back_referrals;
+       bi->bi_operational = ldbm_back_operational;
+       bi->bi_has_subordinates = ldbm_back_hasSubordinates;
 
        /*
         * hooks for slap tools
@@ -78,15 +86,12 @@ ldbm_back_initialize(
        bi->bi_tool_entry_next = ldbm_tool_entry_next;
        bi->bi_tool_entry_get = ldbm_tool_entry_get;
        bi->bi_tool_entry_put = ldbm_tool_entry_put;
-       bi->bi_tool_index_attr = ldbm_tool_index_attr;
-       bi->bi_tool_index_change = ldbm_tool_index_change;
+       bi->bi_tool_entry_reindex = ldbm_tool_entry_reindex;
        bi->bi_tool_sync = ldbm_tool_sync;
 
-#ifdef HAVE_CYRUS_SASL
-       bi->bi_sasl_authorize = 0;
-       bi->bi_sasl_getsecret = 0;
-       bi->bi_sasl_putsecret = 0;
-#endif /* HAVE_CYRUS_SASL */
+       bi->bi_tool_dn2id_get = 0;
+       bi->bi_tool_id2entry_get = 0;
+       bi->bi_tool_entry_modify = 0;
 
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
@@ -110,8 +115,7 @@ ldbm_back_open(
        int rc;
 
        /* initialize the underlying database system */
-       rc = ldbm_initialize();
-
+       rc = ldbm_initialize( NULL );
        return rc;
 }
 
@@ -122,7 +126,6 @@ ldbm_back_close(
 {
        /* terminate the underlying database system */
        ldbm_shutdown();
-
        return 0;
 }
 
@@ -132,7 +135,6 @@ ldbm_back_db_init(
 )
 {
        struct ldbminfo *li;
-       char            *argv[ 4 ];
 
        /* allocate backend-database-specific stuff */
        li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) );
@@ -153,22 +155,32 @@ ldbm_back_db_init(
        li->li_dbwritesync = 1;
 
        /* default file creation mode */
-       li->li_mode = DEFAULT_MODE;
+       li->li_mode = SLAPD_DEFAULT_DB_MODE;
 
        /* default database directory */
-       li->li_directory = ch_strdup( DEFAULT_DB_DIRECTORY );
+       li->li_directory = ch_strdup( SLAPD_DEFAULT_DB_DIR );
+
+       /* DB_ENV environment pointer for DB3 */
+       li->li_dbenv = 0;
+
+       /* envdirok is turned on by ldbm_initialize_env if DB3 */
+       li->li_envdirok = 0;
 
-       argv[ 0 ] = "objectclass";
-       argv[ 1 ] = "eq";
-       argv[ 2 ] = NULL;
-       attr_index_config( li, "ldbm objectclass initialization",
-               0, 2, argv, 1 );
+       /* 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 );
+       ldap_pvt_thread_rdwr_init( &li->li_giant_rwlock );
        ldap_pvt_thread_mutex_init( &li->li_cache.c_mutex );
-       ldap_pvt_thread_mutex_init( &li->li_nextid_mutex );
        ldap_pvt_thread_mutex_init( &li->li_dbcache_mutex );
        ldap_pvt_thread_cond_init( &li->li_dbcache_cv );
 
@@ -182,6 +194,25 @@ ldbm_back_db_open(
     BackendDB  *be
 )
 {
+       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+       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;
 }
 
@@ -192,13 +223,15 @@ ldbm_back_db_destroy(
 {
        /* should free/destroy every in be_private */
        struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+
+       if (li->li_dbenv)
+           ldbm_shutdown_env(li->li_dbenv);
+
        free( li->li_directory );
        attr_index_destroy( li->li_attrs );
 
-       ldap_pvt_thread_mutex_destroy( &li->li_root_mutex );
-       ldap_pvt_thread_mutex_destroy( &li->li_add_mutex );
+       ldap_pvt_thread_rdwr_destroy( &li->li_giant_rwlock );
        ldap_pvt_thread_mutex_destroy( &li->li_cache.c_mutex );
-       ldap_pvt_thread_mutex_destroy( &li->li_nextid_mutex );
        ldap_pvt_thread_mutex_destroy( &li->li_dbcache_mutex );
        ldap_pvt_thread_cond_destroy( &li->li_dbcache_cv );
 
@@ -207,3 +240,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 */
+
+