zap charray

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

diff --git a/servers/slapd/back-ldbm/close.c b/servers/slapd/back-ldbm/close.c
index f5e5442aa52ea9e9bbe88dce2a1f04f9afbe4ad1..383817a5d9baf36b9c4f7cb4ba5699c069b00191 100644 (file)
--- a/servers/slapd/back-ldbm/close.c
+++ b/servers/slapd/back-ldbm/close.c
@@ -1,6 +1,7 @@
 /* close.c - close ldbm backend */
+/* $OpenLDAP$ */
 /*
- * Copyright 1998-1999 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -16,18 +17,29 @@
 int
 ldbm_back_db_close( Backend *be )
 {
-       Debug( LDAP_DEBUG_TRACE, "ldbm backend saving nextid\n", 0, 0, 0 );
-       if ( next_id_save( be ) < 0 ) {
-               Debug( LDAP_DEBUG_ANY, "ldbm backend nextid save failed!\n", 0, 0, 0 );
+       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
        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
+
 
-#ifdef SLAP_CLEANUP
        cache_release_all( &((struct ldbminfo *) be->be_private)->li_cache );
-#endif
 
        return 0;
 }