/* $OpenLDAP$ */
/* This work is part of OpenLDAP Software <http://www.openldap.org/>.
*
- * Copyright 2000-2004 The OpenLDAP Foundation.
+ * Copyright 2000-2011 The OpenLDAP Foundation.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include "slap.h"
#include "back-bdb.h"
-#include "external.h"
/*
* sets *hasSubordinates to LDAP_COMPARE_TRUE/LDAP_COMPARE_FALSE
Entry *e,
int *hasSubordinates )
{
+ struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private;
+ struct bdb_op_info *opinfo;
+ OpExtra *oex;
+ DB_TXN *rtxn;
int rc;
+ int release = 0;
- assert( e );
+ assert( e != NULL );
/* NOTE: this should never happen, but it actually happens
* when using back-relay; until we find a better way to
* 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 */
+ LDAP_SLIST_FOREACH( oex, &op->o_extra, oe_next ) {
+ if ( oex->oe_key == bdb )
+ break;
+ }
+ opinfo = (struct bdb_op_info *) oex;
+ if ( opinfo && opinfo->boi_txn ) {
+ rtxn = opinfo->boi_txn;
+ } else {
+ rc = bdb_reader_get(op, bdb->bi_dbenv, &rtxn);
+ if ( rc ) {
+ rc = LDAP_OTHER;
+ goto done;
+ }
}
retry:
/* FIXME: we can no longer assume the entry's e_private
* field is correctly populated; so we need to reacquire
* it with reader lock */
- rc = bdb_cache_children( op, NULL, e );
-
+ rc = bdb_cache_children( op, rtxn, e );
+
switch( rc ) {
case DB_LOCK_DEADLOCK:
case DB_LOCK_NOTGRANTED:
- ldap_pvt_thread_yield();
goto retry;
case 0:
break;
default:
-#ifdef NEW_LOGGING
- LDAP_LOG ( OPERATION, ERR,
- "=> bdb_hasSubordinates: has_children failed: %s (%d)\n",
- db_strerror(rc), rc, 0 );
-#else
Debug(LDAP_DEBUG_ARGS,
- "<=- bdb_hasSubordinates: has_children failed: %s (%d)\n",
+ "<=- " LDAP_XSTRING(bdb_hasSubordinates)
+ ": has_children failed: %s (%d)\n",
db_strerror(rc), rc, 0 );
-#endif
rc = LDAP_OTHER;
}
+done:;
+ if ( release && e != NULL ) be_entry_release_r( op, e );
return rc;
}
{
Attribute **ap;
- assert( rs->sr_entry );
+ assert( rs->sr_entry != NULL );
- for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next )
- /* just count */ ;
+ for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next ) {
+ if ( (*ap)->a_desc == slap_schema.si_ad_hasSubordinates ) {
+ break;
+ }
+ }
- if ( SLAP_OPATTRS( rs->sr_attr_flags ) ||
- ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) )
+ if ( *ap == NULL &&
+ attr_find( rs->sr_entry->e_attrs, slap_schema.si_ad_hasSubordinates ) == NULL &&
+ ( SLAP_OPATTRS( rs->sr_attr_flags ) ||
+ ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) ) )
{
- int hasSubordinates;
+ int hasSubordinates, rc;
- rs->sr_err = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates );
- if ( rs->sr_err == LDAP_SUCCESS ) {
+ rc = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates );
+ if ( rc == LDAP_SUCCESS ) {
*ap = slap_operational_hasSubordinate( hasSubordinates == LDAP_COMPARE_TRUE );
- assert( *ap );
+ assert( *ap != NULL );
ap = &(*ap)->a_next;
}
}
- return rs->sr_err;
+ return LDAP_SUCCESS;
}