X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Foperational.c;h=f30fb001c87029919c38f5f5600a84fd665e8259;hb=7d13ef7e42f1514dd99878835a13a700da4f4b69;hp=d7f7a586f05e5cdd29fc925f48c0a7dbd995468f;hpb=9d811eb1fa9ffe5ac38108b71a95296c2758b3e3;p=openldap diff --git a/servers/slapd/back-bdb/operational.c b/servers/slapd/back-bdb/operational.c index d7f7a586f0..f30fb001c8 100644 --- a/servers/slapd/back-bdb/operational.c +++ b/servers/slapd/back-bdb/operational.c @@ -2,7 +2,7 @@ /* $OpenLDAP$ */ /* This work is part of OpenLDAP Software . * - * Copyright 2000-2003 The OpenLDAP Foundation. + * Copyright 2000-2012 The OpenLDAP Foundation. * All rights reserved. * * Redistribution and use in source and binary forms, with or without @@ -23,7 +23,6 @@ #include "slap.h" #include "back-bdb.h" -#include "external.h" /* * sets *hasSubordinates to LDAP_COMPARE_TRUE/LDAP_COMPARE_FALSE @@ -35,17 +34,60 @@ bdb_hasSubordinates( 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 + * preserve entry's private information while rewriting it, + * let's disable the hasSubordinate feature for back-relay. + */ + if ( BEI( e ) == NULL ) { + 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: - rc = bdb_cache_children( op, NULL, e ); - + /* 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, rtxn, e ); + switch( rc ) { case DB_LOCK_DEADLOCK: case DB_LOCK_NOTGRANTED: - ldap_pvt_thread_yield(); goto retry; case 0: @@ -58,18 +100,15 @@ retry: 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; } @@ -79,26 +118,34 @@ retry: int bdb_operational( Operation *op, - SlapReply *rs, - int opattrs, - Attribute **a ) + SlapReply *rs ) { - Attribute **aa = a; - - assert( rs->sr_entry ); + Attribute **ap; + + assert( rs->sr_entry != NULL ); + + for ( ap = &rs->sr_operational_attrs; *ap; ap = &(*ap)->a_next ) { + if ( (*ap)->a_desc == slap_schema.si_ad_hasSubordinates ) { + break; + } + } + + 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, rc; - if ( opattrs || ad_inlist( slap_schema.si_ad_hasSubordinates, rs->sr_attrs ) ) { - int hasSubordinates; + rc = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates ); + if ( rc == LDAP_SUCCESS ) { + *ap = slap_operational_hasSubordinate( hasSubordinates == LDAP_COMPARE_TRUE ); + assert( *ap != NULL ); - rs->sr_err = bdb_hasSubordinates( op, rs->sr_entry, &hasSubordinates ); - if ( rs->sr_err == LDAP_SUCCESS ) { - *aa = slap_operational_hasSubordinate( hasSubordinates == LDAP_COMPARE_TRUE ); - if ( *aa != NULL ) { - aa = &(*aa)->a_next; - } + ap = &(*ap)->a_next; } } - return rs->sr_err; + return LDAP_SUCCESS; }