unifdef -DBDB_SUBENTRIES -DLDBM_SUBENTRIES

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

diff --git a/servers/slapd/back-ldbm/init.c b/servers/slapd/back-ldbm/init.c
index b8a6831ce5d4609d521d475ee66cc5fd59e4893f..f588cb7620c5399abc679344ccdebcaa8dba9739 100644 (file)
--- a/servers/slapd/back-ldbm/init.c
+++ b/servers/slapd/back-ldbm/init.c
@@ -32,9 +32,7 @@ ldbm_back_initialize(
 {
        static char *controls[] = {
                LDAP_CONTROL_MANAGEDSAIT,
-#ifdef LDAP_CONTROL_X_PERMISSIVE_MODIFY
                LDAP_CONTROL_X_PERMISSIVE_MODIFY,
-#endif
                NULL
        };
 
@@ -42,9 +40,7 @@ ldbm_back_initialize(
 
        bi->bi_flags |= 
                SLAP_BFLAG_INCREMENT |
-#ifdef LDBM_SUBENTRIES
                SLAP_BFLAG_SUBENTRIES |
-#endif
                SLAP_BFLAG_ALIASES |
                SLAP_BFLAG_REFERRALS;
 
@@ -195,6 +191,28 @@ ldbm_back_db_open(
 )
 {
        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 );