ITS#4310 seems to affect also back-ldbm

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

diff --git a/servers/slapd/back-ldbm/close.c b/servers/slapd/back-ldbm/close.c
index 3c16884478b5065c9d6d1d4de5788bd97027fca4..9ed651de3fcdcbf8d33bb2f14a5c3edc22771930 100644 (file)
--- a/servers/slapd/back-ldbm/close.c
+++ b/servers/slapd/back-ldbm/close.c
@@ -2,7 +2,7 @@
 /* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 1998-2003 The OpenLDAP Foundation.
+ * Copyright 1998-2006 The OpenLDAP Foundation.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -26,29 +26,18 @@
 int
 ldbm_back_db_close( Backend *be )
 {
-       struct ldbminfo *li = (struct ldbminfo *) be->be_private;
-       if ( li->li_dbsyncfreq > 0 )
-       {
-               li->li_dbshutdown++;
-               ldap_pvt_thread_join( li->li_dbsynctid, (void *) NULL );
-       }
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_LDBM, CRIT,
-                  "ldbm_back_db_close: ldbm backend syncing\n", 0, 0, 0 );
-#else
+       struct ldbminfo *li = be->be_private;
+
        Debug( LDAP_DEBUG_TRACE, "ldbm backend syncing\n", 0, 0, 0 );
-#endif
 
        ldbm_cache_flush_all( be );
-#ifdef NEW_LOGGING
-       LDAP_LOG( BACK_LDBM, CRIT,
-                  "ldbm_back_db_close: ldbm backend synch'ed\n", 0, 0, 0 );
-#else
        Debug( LDAP_DEBUG_TRACE, "ldbm backend done syncing\n", 0, 0, 0 );
-#endif
 
-
-       cache_release_all( &((struct ldbminfo *) be->be_private)->li_cache );
+       cache_release_all( &li->li_cache );
+       if ( alock_close( &li->li_alock_info )) {
+               Debug( LDAP_DEBUG_ANY,
+                       "ldbm_back_db_close: alock_close failed\n", 0, 0, 0 );
+       }
 
        return 0;
 }