Import syncrepl psearch add bug fix

This commit is contained in:
Kurt Zeilenga 2004-01-01 19:21:58 +00:00
parent cc31e242cd
commit 3e03997933
3 changed files with 7 additions and 11 deletions

View File

@ -1,7 +1,7 @@
OpenLDAP 2.2 Change Log
OpenLDAP 2.2.4 Engineering
<insert notes here>
OpenLDAP 2.2.5 Engineering
Fix back-bdb syncrepl psearch add bug
OpenLDAP 2.2.4 Release
Initial release for "general" use.

View File

@ -496,8 +496,9 @@ retry: /* transaction retry */
if ( rs->sr_err == LDAP_SUCCESS && !op->o_no_psearch ) {
ldap_pvt_thread_rdwr_rlock( &bdb->bi_pslist_rwlock );
assert( BEI(e) );
LDAP_LIST_FOREACH ( ps_list, &bdb->bi_psearch_list, o_ps_link ) {
bdb_psearch( op, rs, ps_list, op->oq_add.rs_e,
bdb_psearch( op, rs, ps_list, e,
LDAP_PSEARCH_BY_ADD );
}
ldap_pvt_thread_rdwr_runlock( &bdb->bi_pslist_rwlock );

View File

@ -1001,9 +1001,6 @@ id2entry_retry:
} else {
e = ps_e;
}
#if 0
assert( BEI(e) );
#endif
rs->sr_entry = e;
@ -1054,15 +1051,13 @@ id2entry_retry:
break;
case LDAP_SCOPE_SUBTREE: {
EntryInfo *tmp = BEI(e);
if ( tmp ) for (; tmp->bei_parent; tmp = tmp->bei_parent ) {
EntryInfo *tmp;
for (tmp = BEI(e); tmp->bei_parent;
tmp = tmp->bei_parent ) {
if ( tmp->bei_id == base.e_id ) {
scopeok = 1;
break;
}
} else {
/* FIXME */
scopeok = 1;
}
} break;
}