fix referral return in back-ldbm as well (same as ITS#3475)

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

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 1afaf5c22e2c81b89b7c17eef658417ee80398dc..424e621b16c35193caefa0ab906f11f918c883eb 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -1,8 +1,17 @@
 /* init.c - initialize ldbm backend */
 /* $OpenLDAP$ */
-/*
- * Copyright 1998-2002 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-2005 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"
@@ -15,21 +24,6 @@
 #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,11 +31,23 @@ ldbm_back_initialize(
 {
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
+               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 = NULL;
        bi->bi_close = ldbm_back_close;
@@ -66,10 +72,10 @@ ldbm_back_initialize(
        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_acl_attribute = ldbm_back_attribute;
+       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
@@ -83,6 +89,10 @@ ldbm_back_initialize(
        bi->bi_tool_entry_reindex = ldbm_tool_entry_reindex;
        bi->bi_tool_sync = ldbm_tool_sync;
 
+       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;
 
@@ -145,10 +155,10 @@ 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;
@@ -169,10 +179,8 @@ ldbm_back_db_init(
        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 );
 
@@ -222,10 +230,8 @@ ldbm_back_db_destroy(
        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 );
 
@@ -234,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 */
+
+