Change 'unsigned long len' to ber_len_t in get_filter()

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

diff --git a/servers/slapd/back-bdb2/init.c b/servers/slapd/back-bdb2/init.c
index 8d17af1632736c326b87276234afc31c30a70df8..593405061b3754db9ae3928eda754bceba69b392 100644 (file)
--- a/servers/slapd/back-bdb2/init.c
+++ b/servers/slapd/back-bdb2/init.c
@@ -75,9 +75,7 @@ bdb2_back_initialize(
        bi->bi_op_abandon = bdb2_back_abandon;
 
        bi->bi_entry_release_rw = bdb2_back_entry_release_rw;
-#ifdef SLAPD_ACLGROUPS
        bi->bi_acl_group = bdb2_back_group;
-#endif
 
        bi->bi_connection_init = 0;
        bi->bi_connection_destroy = 0;
@@ -173,17 +171,16 @@ bdb2i_back_db_init_internal(
                attr_syntax_config( "ldbm dn initialization", 0, 2, argv );
        }
        argv[ 0 ] = "dn";
-       argv[ 1 ] = "sub";
-       argv[ 2 ] = "eq";
-       argv[ 3 ] = NULL;
-       bdb2i_attr_index_config( li, "ldbm dn initialization", 0, 3, argv, 1 );
+       argv[ 1 ] = "eq,sub";
+       argv[ 2 ] = NULL;
+       bdb2i_attr_index_config( li, "ldbm dn initialization", 0, 2, argv, 1 );
        argv[ 0 ] = "id2children";
        argv[ 1 ] = "eq";
        argv[ 2 ] = NULL;
        bdb2i_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;
        bdb2i_attr_index_config( li, "ldbm objectclass initialization", 0, 2, argv,
            1 );