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

fix opinfo

Browse source
This commit is contained in:
Howard Chu 2011-08-26 01:24:06 -07:00
parent 8a6b9ea1a3
commit 5d60046801
5 changed files with 10 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
servers/slapd/back-mdb/bind.c
View file

@ -135,15 +135,9 @@ mdb_bind( Operation *op, SlapReply *rs )
}
done:
moi->moi_ref--;
if ( moi->moi_ref < 1 ) {
if ( moi->moi_flag & MOI_READER ) {
mdb_txn_reset( moi->moi_txn );
} /* writers can abort themselves */
if ( moi == &opinfo ) {
mdb_txn_reset( moi->moi_txn );
LDAP_SLIST_REMOVE( &op->o_extra, &moi->moi_oe, OpExtra, oe_next );
if ( moi->moi_flag & MOI_FREEIT ) {
op->o_tmpfree( moi, op->o_tmpmemctx );
}
}
/* free entry and reader lock */
if( e != NULL ) {

10
servers/slapd/back-mdb/compare.c
View file

@ -123,15 +123,9 @@ return_results:
}
done:
moi->moi_ref--;
if ( moi->moi_ref < 1 ) {
if ( moi->moi_flag & MOI_READER ) {
mdb_txn_reset( moi->moi_txn );
} /* writers can abort themselves */
if ( moi == &opinfo ) {
mdb_txn_reset( moi->moi_txn );
LDAP_SLIST_REMOVE( &op->o_extra, &moi->moi_oe, OpExtra, oe_next );
if ( moi->moi_flag & MOI_FREEIT ) {
op->o_tmpfree( moi, op->o_tmpmemctx );
}
}
/* free entry */
if ( e != NULL ) {

10
servers/slapd/back-mdb/operational.c
View file

@ -73,15 +73,9 @@ mdb_hasSubordinates(
}
done:;
moi->moi_ref--;
if ( moi->moi_ref < 1 ) {
if ( moi->moi_flag & MOI_READER ) {
mdb_txn_reset( moi->moi_txn );
} /* writers can abort themselves */
if ( moi == &opinfo ) {
mdb_txn_reset( moi->moi_txn );
LDAP_SLIST_REMOVE( &op->o_extra, &moi->moi_oe, OpExtra, oe_next );
if ( moi->moi_flag & MOI_FREEIT ) {
op->o_tmpfree( moi, op->o_tmpmemctx );
}
}
return rc;
}

10
servers/slapd/back-mdb/referral.c
View file

@ -139,15 +139,9 @@ mdb_referrals( Operation *op, SlapReply *rs )
}
done:
moi->moi_ref--;
if ( moi->moi_ref < 1 ) {
if ( moi->moi_flag & MOI_READER ) {
mdb_txn_reset( moi->moi_txn );
} /* writers can abort themselves */
if ( moi == &opinfo ) {
mdb_txn_reset( moi->moi_txn );
LDAP_SLIST_REMOVE( &op->o_extra, &moi->moi_oe, OpExtra, oe_next );
if ( moi->moi_flag & MOI_FREEIT ) {
op->o_tmpfree( moi, op->o_tmpmemctx );
}
}
if ( e )
mdb_entry_return( e );

10
servers/slapd/back-mdb/search.c
View file

@ -815,15 +815,9 @@ nochange:
rs->sr_err = LDAP_SUCCESS;
done:
moi->moi_ref--;
if ( moi->moi_ref < 1 ) {
if ( moi->moi_flag & MOI_READER ) {
mdb_txn_reset( moi->moi_txn );
} /* writers can abort themselves */
if ( moi == &opinfo ) {
mdb_txn_reset( moi->moi_txn );
LDAP_SLIST_REMOVE( &op->o_extra, &moi->moi_oe, OpExtra, oe_next );
if ( moi->moi_flag & MOI_FREEIT ) {
op->o_tmpfree( moi, op->o_tmpmemctx );
}
}
if( idcursor )
mdb_cursor_close( idcursor );