X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=servers%2Fslapd%2Fback-bdb%2Freferral.c;h=fb29411ffe9556caf53ca1cd9aaef9ddbbe9609b;hb=5c6976518b2d31112bf5f35ed459b22e5713afff;hp=7b401f8bf477be1a4639d61174f41bed6806f030;hpb=0e2af54a3ffdeebe3901370683be56fcc53023b0;p=openldap diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c index 7b401f8bf4..fb29411ffe 100644 --- a/servers/slapd/back-bdb/referral.c +++ b/servers/slapd/back-bdb/referral.c @@ -1,8 +1,17 @@ /* referral.c - BDB backend referral handler */ /* $OpenLDAP$ */ -/* - * Copyright 2000-2002 The OpenLDAP Foundation, All Rights Reserved. - * COPYING RESTRICTIONS APPLY, see COPYRIGHT file +/* This work is part of OpenLDAP Software . + * + * Copyright 2000-2008 The OpenLDAP Foundation. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted only as authorized by the OpenLDAP + * Public License. + * + * A copy of this license is available in the file LICENSE in the + * top-level directory of the distribution or, alternatively, at + * . */ #include "portable.h" @@ -10,20 +19,17 @@ #include #include "back-bdb.h" -#include "external.h" int -bdb_referrals( - BackendDB *be, - Connection *conn, - Operation *op, - struct berval *dn, - struct berval *ndn, - const char **text ) +bdb_referrals( Operation *op, SlapReply *rs ) { - struct bdb_info *bdb = (struct bdb_info *) be->be_private; + struct bdb_info *bdb = (struct bdb_info *) op->o_bd->be_private; + Entry *e = NULL; + EntryInfo *ei; int rc = LDAP_SUCCESS; - Entry *e = NULL, *matched; + + DB_TXN *rtxn; + DB_LOCK lock; if( op->o_tag == LDAP_REQ_SEARCH ) { /* let search take care of itself */ @@ -35,84 +41,112 @@ bdb_referrals( return rc; } + rc = bdb_reader_get(op, bdb->bi_dbenv, &rtxn); + switch(rc) { + case 0: + break; + default: + return LDAP_OTHER; + } + +dn2entry_retry: /* get entry */ - rc = bdb_dn2entry( be, NULL, ndn, &e, &matched, 0 ); + rc = bdb_dn2entry( op, rtxn, &op->o_req_ndn, &ei, 1, &lock ); + + /* bdb_dn2entry() may legally leave ei == NULL + * if rc != 0 and rc != DB_NOTFOUND + */ + if ( ei ) { + e = ei->bei_e; + } switch(rc) { case DB_NOTFOUND: - rc = 0; case 0: break; + case LDAP_BUSY: + rs->sr_text = "ldap server busy"; + return LDAP_BUSY; + case DB_LOCK_DEADLOCK: + case DB_LOCK_NOTGRANTED: + goto dn2entry_retry; default: Debug( LDAP_DEBUG_TRACE, - "bdb_referrals: dn2entry failed: %s (%d)\n", + LDAP_XSTRING(bdb_referrals) + ": dn2entry failed: %s (%d)\n", db_strerror(rc), rc, 0 ); - send_ldap_result( conn, op, rc=LDAP_OTHER, - NULL, "internal error", NULL, NULL ); - return rc; + rs->sr_text = "internal error"; + return LDAP_OTHER; } - if ( e == NULL ) { - char *matched_dn = NULL; - BVarray refs = NULL; - - if ( matched != NULL ) { - matched_dn = ch_strdup( matched->e_dn ); - + if ( rc == DB_NOTFOUND ) { + rc = LDAP_SUCCESS; + rs->sr_matched = NULL; + if ( e != NULL ) { Debug( LDAP_DEBUG_TRACE, - "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n", - (long) op->o_tag, dn, matched_dn ); + LDAP_XSTRING(bdb_referrals) + ": tag=%lu target=\"%s\" matched=\"%s\"\n", + (unsigned long)op->o_tag, op->o_req_dn.bv_val, e->e_name.bv_val ); - if( is_entry_referral( matched ) ) { + if( is_entry_referral( e ) ) { + BerVarray ref = get_entry_referrals( op, e ); rc = LDAP_OTHER; - refs = get_entry_referrals( be, conn, op, matched ); + rs->sr_ref = referral_rewrite( ref, &e->e_name, + &op->o_req_dn, LDAP_SCOPE_DEFAULT ); + ber_bvarray_free( ref ); + if ( rs->sr_ref ) { + rs->sr_matched = ber_strdup_x( + e->e_name.bv_val, op->o_tmpmemctx ); + } } - bdb_entry_return( be, matched ); - matched = NULL; - } else if ( default_referral != NULL ) { - rc = LDAP_OTHER; - refs = referral_rewrite( default_referral, - NULL, dn, LDAP_SCOPE_DEFAULT ); + bdb_cache_return_entry_r (bdb, e, &lock); + e = NULL; } - if( refs != NULL ) { + if( rs->sr_ref != NULL ) { /* send referrals */ - send_ldap_result( conn, op, rc = LDAP_REFERRAL, - matched_dn, NULL, refs, NULL ); - bvarray_free( refs ); + rc = rs->sr_err = LDAP_REFERRAL; + send_ldap_result( op, rs ); + ber_bvarray_free( rs->sr_ref ); + rs->sr_ref = NULL; } else if ( rc != LDAP_SUCCESS ) { - send_ldap_result( conn, op, rc, matched_dn, - matched_dn ? "bad referral object" : NULL, - NULL, NULL ); + rs->sr_text = rs->sr_matched ? "bad referral object" : NULL; } - free( matched_dn ); + if (rs->sr_matched) { + op->o_tmpfree( (char *)rs->sr_matched, op->o_tmpmemctx ); + rs->sr_matched = NULL; + } return rc; } if ( is_entry_referral( e ) ) { /* entry is a referral */ - BVarray refs = get_entry_referrals( be, conn, op, e ); - BVarray rrefs = referral_rewrite( - refs, &e->e_name, dn, LDAP_SCOPE_DEFAULT ); + BerVarray refs = get_entry_referrals( op, e ); + rs->sr_ref = referral_rewrite( + refs, &e->e_name, &op->o_req_dn, LDAP_SCOPE_DEFAULT ); Debug( LDAP_DEBUG_TRACE, - "bdb_referrals: op=%ld target=\"%s\" matched=\"%s\"\n", - (long) op->o_tag, dn->bv_val, e->e_dn ); - - if( rrefs != NULL ) { - send_ldap_result( conn, op, rc = LDAP_REFERRAL, - e->e_dn, NULL, rrefs, NULL ); - bvarray_free( rrefs ); + LDAP_XSTRING(bdb_referrals) + ": tag=%lu target=\"%s\" matched=\"%s\"\n", + (unsigned long)op->o_tag, op->o_req_dn.bv_val, e->e_name.bv_val ); + + rs->sr_matched = e->e_name.bv_val; + if( rs->sr_ref != NULL ) { + rc = rs->sr_err = LDAP_REFERRAL; + send_ldap_result( op, rs ); + ber_bvarray_free( rs->sr_ref ); + rs->sr_ref = NULL; } else { - send_ldap_result( conn, op, rc = LDAP_OTHER, e->e_dn, - "bad referral object", NULL, NULL ); + rc = LDAP_OTHER; + rs->sr_text = "bad referral object"; } - bvarray_free( refs ); + rs->sr_matched = NULL; + ber_bvarray_free( refs ); } - bdb_entry_return( be, e ); + bdb_cache_return_entry_r(bdb, e, &lock); return rc; }