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 452d38f222c16e2f29bd6fdec2302adbdc74c5c1..383817a5d9baf36b9c4f7cb4ba5699c069b00191 100644 (file)
--- a/servers/slapd/back-ldbm/close.c
+++ b/servers/slapd/back-ldbm/close.c
@@ -1,7 +1,7 @@
 /* close.c - close ldbm backend */
 /* $OpenLDAP$ */
 /*
- * Copyright 1998-2000 The OpenLDAP Foundation, All Rights Reserved.
+ * Copyright 1998-2002 The OpenLDAP Foundation, All Rights Reserved.
  * COPYING RESTRICTIONS APPLY, see COPYRIGHT file
  */
 
@@ -17,17 +17,23 @@
 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(( "backend", LDAP_LEVEL_CRIT,
-                  "ldbm_back_db_close: ldbm backend syncing\n" ));
+       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(( "backend", LDAP_LEVEL_CRIT,
-                  "ldbm_back_db_close: ldbm backend synch'ed\n" ));
+       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