Set peeraddr also for IPv6, fixes ITS#1918

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

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index 1fe1335666f1de3fcd9f0662710ded8a981b3aca..d3e16e31c95b4b709180b1ca7e4aaf4f20a8e401 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -37,6 +37,7 @@ ldbm_back_initialize(
 {
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
+               LDAP_CONTROL_VALUESRETURNFILTER,
                NULL
        };
 
@@ -148,10 +149,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;
@@ -172,10 +173,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 );
 
@@ -202,8 +201,13 @@ ldbm_back_db_open(
 
                if ( rc != 0 )
                {
+#ifdef NEW_LOGGING
+                       LDAP_LOG (( "init", LDAP_LEVEL_ERR, "ldbm_back_db_open: sync "
+                       "ldap_pvt_thread_create failed (%d)\n", rc ));
+#else  
                        Debug(  LDAP_DEBUG_ANY,
                                "sync ldap_pvt_thread_create failed (%d)\n", rc, 0, 0 );
+#endif
                        return 1;
                }
        }
@@ -225,10 +229,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 );