mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-02-23 14:09:39 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix prev commit

Browse Source
This commit is contained in:
Howard Chu 2008-05-01 13:25:15 +00:00
parent c91704d811
commit aeedb72e91
7 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
servers/slapd/back-bdb/add.c
View File

@ -159,7 +159,7 @@ retry: /* transaction retry */
locker = TXN_ID ( ltid );
opinfo.boi_oe.oe_key = op->o_bd->bd_self;
opinfo.boi_oe.oe_key = bdb;
opinfo.boi_txn = ltid;
opinfo.boi_err = 0;
opinfo.boi_acl_cache = op->o_do_not_cache;

6
servers/slapd/back-bdb/cache.c
View File

@ -174,6 +174,8 @@ bdb_cache_entry_db_relock(
if ( !lock ) return 0;
Debug( LDAP_DEBUG_TRACE, "bdb_cache_entry_dn_relock: lock %p locker %d\n", lock,locker,0 );
lockobj.data = &ei->bei_id;
lockobj.size = sizeof(ei->bei_id) + 1;
@ -210,6 +212,8 @@ bdb_cache_entry_db_lock( struct bdb_info *bdb, BDB_LOCKER locker, EntryInfo *ei,
if ( !lock ) return 0;
Debug( LDAP_DEBUG_TRACE, "bdb_cache_entry_db_lock: lock %p locker %d\n", lock,locker,0 );
if (rw)
db_rw = DB_LOCK_WRITE;
else
@ -239,6 +243,8 @@ bdb_cache_entry_db_unlock ( struct bdb_info *bdb, DB_LOCK *lock )
if ( !lock || lock->mode == DB_LOCK_NG ) return 0;
Debug( LDAP_DEBUG_TRACE, "bdb_cache_entry_db_unlock: lock %p\n", lock,0,0 );
rc = LOCK_PUT ( bdb->bi_dbenv, lock );
return rc;
#endif

2
servers/slapd/back-bdb/delete.c
View File

@ -156,7 +156,7 @@ retry: /* transaction retry */
locker = TXN_ID ( ltid );
opinfo.boi_oe.oe_key = op->o_bd->bd_self;
opinfo.boi_oe.oe_key = bdb;
opinfo.boi_txn = ltid;
opinfo.boi_err = 0;
opinfo.boi_acl_cache = op->o_do_not_cache;

6
servers/slapd/back-bdb/id2entry.c
View File

@ -259,7 +259,7 @@ int bdb_entry_release(
}
/* free entry and reader or writer lock */
LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) {
if ( oex->oe_key == op->o_bd->bd_self ) break;
if ( oex->oe_key == bdb ) break;
}
boi = (struct bdb_op_info *)oex;
@ -335,7 +335,7 @@ int bdb_entry_get(
if( op ) {
OpExtra *oex;
LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) {
if ( oex->oe_key == op->o_bd->bd_self ) break;
if ( oex->oe_key == bdb ) break;
}
boi = (struct bdb_op_info *)oex;
if ( boi )
@ -416,7 +416,7 @@ return_results:
if ( op ) {
if ( !boi ) {
boi = op->o_tmpcalloc(1,sizeof(struct bdb_op_info),op->o_tmpmemctx);
boi->boi_oe.oe_key = op->o_bd;
boi->boi_oe.oe_key = bdb;
LDAP_SLIST_INSERT_HEAD( &op->o_extra, &boi->boi_oe, oe_next );
}
if ( !boi->boi_txn ) {

2
servers/slapd/back-bdb/modify.c
View File

@ -440,7 +440,7 @@ retry: /* transaction retry */
locker = TXN_ID ( ltid );
opinfo.boi_oe.oe_key = op->o_bd->bd_self;
opinfo.boi_oe.oe_key = bdb;
opinfo.boi_txn = ltid;
opinfo.boi_err = 0;
opinfo.boi_acl_cache = op->o_do_not_cache;

2
servers/slapd/back-bdb/modrdn.c
View File

@ -166,7 +166,7 @@ retry: /* transaction retry */
locker = TXN_ID ( ltid );
opinfo.boi_oe.oe_key = op->o_bd->bd_self;
opinfo.boi_oe.oe_key = bdb;
opinfo.boi_txn = ltid;
opinfo.boi_err = 0;
opinfo.boi_acl_cache = op->o_do_not_cache;

2
servers/slapd/back-bdb/search.c
View File

@ -328,7 +328,7 @@ bdb_search( Operation *op, SlapReply *rs )
attrs = op->oq_search.rs_attrs;
LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) {
if ( oex->oe_key == (void *)op->o_bd->bd_self )
if ( oex->oe_key == bdb )
break;
}
opinfo = (struct bdb_op_info *) oex;