/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 1998-2005 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
{
static char *controls[] = {
LDAP_CONTROL_MANAGEDSAIT,
-#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
LDAP_CONTROL_X_PERMISSIVE_MODIFY,
-#endif
NULL
};
bi->bi_flags |=
SLAP_BFLAG_INCREMENT |
-#ifdef LDBM_SUBENTRIES
SLAP_BFLAG_SUBENTRIES |
-#endif
SLAP_BFLAG_ALIASES |
SLAP_BFLAG_REFERRALS;
)
{
struct ldbminfo *li = (struct ldbminfo *) be->be_private;
+ int rc;
+
+ rc = alock_open( &li->li_alock_info, "slapd",
+ li->li_directory, ALOCK_UNIQUE );
+ if ( rc == ALOCK_BUSY ) {
+ Debug( LDAP_DEBUG_ANY,
+ "ldbm_back_db_open: database already in use\n",
+ 0, 0, 0 );
+ return -1;
+ } else if ( rc == ALOCK_RECOVER ) {
+ Debug( LDAP_DEBUG_ANY,
+ "ldbm_back_db_open: unclean shutdown detected;"
+ " database may be inconsistent!\n",
+ 0, 0, 0 );
+ rc = alock_recover( &li->li_alock_info );
+ }
+ if ( rc != ALOCK_CLEAN ) {
+ Debug( LDAP_DEBUG_ANY,
+ "ldbm_back_db_open: alock package is unstable;"
+ " database may be inconsistent!\n",
+ 0, 0, 0 );
+ }
li->li_dbenv = ldbm_initialize_env( li->li_directory,
li->li_dbcachesize, &li->li_envdirok );
{
ldap_pvt_thread_mutex_lock( &slapd_rq.rq_mutex );
ldap_pvt_runqueue_insert( &slapd_rq, li->li_dbsyncfreq,
- ldbm_cache_sync_daemon, be );
+ ldbm_cache_sync_daemon, be,
+ "ldbm_cache_sync", be->be_suffix[0].bv_val );
ldap_pvt_thread_mutex_unlock( &slapd_rq.rq_mutex );
}