Import slapd.conf mode change (with typo correction) from -devel.

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

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 407e3c74ee63df64a8dfc64e1eb6772eedc271df..7d7418825d6a1d9684afbcdd2e96320667777c4b 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -19,10 +19,6 @@ ldbm_back_init(
        char            *argv[ 4 ];
        int             i;
 
-#ifdef SLAPD_CRYPT
-       extern pthread_mutex_t crypt_mutex;
-#endif /* SLAPD_CRYPT */
-
        /* allocate backend-specific stuff */
        li = (struct ldbminfo *) ch_calloc( 1, sizeof(struct ldbminfo) );
 
@@ -60,19 +56,18 @@ ldbm_back_init(
        attr_index_config( li, "ldbm id2children initialization", 0, 2, argv,
            1 );
        argv[ 0 ] = "objectclass";
-       argv[ 1 ] = strdup( "pres,eq" );
+       argv[ 1 ] = ch_strdup( "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 */
+       pthread_mutex_init( &li->li_root_mutex, pthread_mutexattr_default );
+       pthread_mutex_init( &li->li_add_mutex, pthread_mutexattr_default );
        pthread_mutex_init( &li->li_cache.c_mutex, pthread_mutexattr_default );
        pthread_mutex_init( &li->li_nextid_mutex, pthread_mutexattr_default );
        pthread_mutex_init( &li->li_dbcache_mutex, pthread_mutexattr_default );
-#ifdef SLAPD_CRYPT
-       pthread_mutex_init( &crypt_mutex, pthread_mutexattr_default );
-#endif /* SLAPD_CRYPT */
        pthread_cond_init( &li->li_dbcache_cv, pthread_condattr_default );
        for ( i = 0; i < MAXDBCACHE; i++ ) {
                pthread_mutex_init( &li->li_dbcache[i].dbc_mutex,