mirror/openldap
2
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2025-01-30 13:30:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

try harder to compute hasSubordinates (ITS#6549)

Browse Source
This commit is contained in:
Pierangelo Masarati 2010-05-18 02:18:48 +00:00
parent 2dd75cf206
commit ba507dc27b
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
servers/slapd/back-bdb/operational.c
View File

@ -39,6 +39,7 @@ bdb_hasSubordinates(
OpExtra *oex;
DB_TXN *rtxn;
int rc;
int release = 0;
assert( e != NULL );
@ -48,7 +49,18 @@ bdb_hasSubordinates(
* let's disable the hasSubordinate feature for back-relay.
*/
if ( BEI( e ) == NULL ) {
return LDAP_OTHER;
Entry *ee = NULL;
rc = be_entry_get_rw( op, &e->e_nname, NULL, NULL, 0, &ee );
if ( rc != LDAP_SUCCESS || ee == NULL ) {
rc = LDAP_OTHER;
goto done;
}
e = ee;
release = 1;
if ( BEI( ee ) == NULL ) {
rc = LDAP_OTHER;
goto done;
}
}
/* Check for a txn in a parent op, otherwise use reader txn */
@ -61,7 +73,10 @@ bdb_hasSubordinates(
rtxn = opinfo->boi_txn;
} else {
rc = bdb_reader_get(op, bdb->bi_dbenv, &rtxn);
if ( rc ) return LDAP_OTHER;
if ( rc ) {
rc = LDAP_OTHER;
goto done;
}
}
retry:
@ -92,6 +107,8 @@ retry:
rc = LDAP_OTHER;
}
done:;
if ( release && e != NULL ) be_entry_release_r( op, e );
return rc;
}