Fix -USLAPD_RLOOKUPS

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

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 4ca59cf035004a1cc541cd6e935627dc3c93a28d..4a95b5bf932c8a2b6955d5db13980bb0a1afa5e9 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -10,6 +10,20 @@
 #include "slap.h"
 #include "back-ldbm.h"
 
+#ifdef SLAPD_LDBM_DYNAMIC
+#include <gmodule.h>
+
+G_MODULE_EXPORT void init_module(int argc, char *argv[]) {
+   BackendInfo bi;
+
+   bi.bi_type = "ldbm";
+   bi.bi_init = ldbm_back_initialize;
+
+   backend_add(&bi);
+}
+
+#endif /* SLAPD_LDBM_DYNAMIC */
+
 int
 ldbm_back_initialize(
     BackendInfo        *bi
@@ -36,9 +50,11 @@ ldbm_back_initialize(
        bi->bi_op_delete = ldbm_back_delete;
        bi->bi_op_abandon = ldbm_back_abandon;
 
-#ifdef SLAPD_ACLGROUPS
+       bi->bi_entry_release_rw = ldbm_back_entry_release_rw;
        bi->bi_acl_group = ldbm_back_group;
-#endif
+
+       bi->bi_connection_init = 0;
+       bi->bi_connection_destroy = 0;
 
        return 0;
 }
@@ -109,26 +125,26 @@ ldbm_back_db_init(
        li->li_directory = ch_strdup( DEFAULT_DB_DIRECTORY );
 
        /* always index dn, id2children, objectclass (used in some searches) */
+       if ( !at_find( "dn" ) ) {
+               argv[ 0 ] = "dn";
+               argv[ 1 ] = "dn";
+               argv[ 2 ] = NULL;
+               attr_syntax_config( "ldbm dn initialization", 0, 2, argv );
+       }
        argv[ 0 ] = "dn";
-       argv[ 1 ] = "dn";
+       argv[ 1 ] = "eq,sub";
        argv[ 2 ] = NULL;
-       attr_syntax_config( "ldbm dn initialization", 0, 2, argv );
-       argv[ 0 ] = "dn";
-       argv[ 1 ] = "sub";
-       argv[ 2 ] = "eq";
-       argv[ 3 ] = NULL;
-       attr_index_config( li, "ldbm dn initialization", 0, 3, argv, 1 );
+       attr_index_config( li, "ldbm dn initialization", 0, 2, argv, 1 );
        argv[ 0 ] = "id2children";
        argv[ 1 ] = "eq";
        argv[ 2 ] = NULL;
        attr_index_config( li, "ldbm id2children initialization", 0, 2, argv,
            1 );
        argv[ 0 ] = "objectclass";
-       argv[ 1 ] = ch_strdup( "pres,eq" );
+       argv[ 1 ] = "pres,eq";
        argv[ 2 ] = NULL;
        attr_index_config( li, "ldbm objectclass initialization", 0, 2, argv,
            1 );
-       free( argv[ 1 ] );
 
        /* initialize various mutex locks & condition variables */
        ldap_pvt_thread_mutex_init( &li->li_root_mutex );