upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-04 06:01:23 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

New mdb_close() signature

Browse source
This commit is contained in:
Howard Chu 2011-09-18 13:25:38 -07:00
parent e76299c196
commit 94c0b077d8
3 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
servers/slapd/back-mdb/attr.c
View file

@ -157,14 +157,13 @@ mdb_attr_dbs_open(
void
mdb_attr_dbs_close(
struct mdb_info *mdb,
MDB_txn *txn
struct mdb_info *mdb
)
{
int i;
for ( i=0; i<mdb->mi_nattrs; i++ )
if ( mdb->mi_attrs[i]->ai_dbi )
mdb_close( txn, mdb->mi_attrs[i]->ai_dbi );
mdb_close( mdb->mi_dbenv, mdb->mi_attrs[i]->ai_dbi );
}
int

8
servers/slapd/back-mdb/init.c
View file

@ -265,7 +265,6 @@ mdb_db_close( BackendDB *be, ConfigReply *cr )
{
int rc;
struct mdb_info *mdb = (struct mdb_info *) be->be_private;
MDB_txn *txn;
/* monitor handling */
(void)mdb_monitor_db_close( be );
@ -279,13 +278,10 @@ mdb_db_close( BackendDB *be, ConfigReply *cr )
if ( mdb->mi_dbenv ) {
if ( mdb->mi_dbis[0] ) {
int i;
rc = mdb_txn_begin( mdb->mi_dbenv, MDB_RDONLY, &txn );
mdb_attr_dbs_close( mdb, txn );
mdb_attr_dbs_close( mdb );
for ( i=0; i<MDB_NDB; i++ )
mdb_close( txn, mdb->mi_dbis[i] );
mdb_txn_abort( txn );
mdb_close( mdb->mi_dbenv, mdb->mi_dbis[i] );
/* force a sync, but not if we were ReadOnly,
* and not in Quick mode.

2
servers/slapd/back-mdb/proto-mdb.h
View file

@ -33,7 +33,7 @@ int mdb_attr_slot( struct mdb_info *mdb,
AttributeDescription *desc, int *insert );
int mdb_attr_dbs_open( BackendDB *be, MDB_txn *txn, struct config_reply_s *cr );
void mdb_attr_dbs_close( struct mdb_info *mdb, MDB_txn *txn );
void mdb_attr_dbs_close( struct mdb_info *mdb );
int mdb_attr_index_config LDAP_P(( struct mdb_info *mdb,
const char *fname, int lineno,