Merge remote branch 'origin/mdb.master'

[openldap] / servers / slapd / back-bdb / referral.c

diff --git a/servers/slapd/back-bdb/referral.c b/servers/slapd/back-bdb/referral.c
index 382feca3612339e2e314779246a6284905492a72..d8280fd0a2419e4e3f57a84dd8a5a84fd624b727 100644 (file)
--- a/servers/slapd/back-bdb/referral.c
+++ b/servers/slapd/back-bdb/referral.c
@@ -2,7 +2,7 @@
 /* $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
@@ -28,7 +28,7 @@ bdb_referrals( Operation *op, SlapReply *rs )
        EntryInfo *ei;
        int rc = LDAP_SUCCESS;
 
-       u_int32_t       locker;
+       DB_TXN          *rtxn;
        DB_LOCK         lock;
 
        if( op->o_tag == LDAP_REQ_SEARCH ) {
@@ -41,7 +41,7 @@ bdb_referrals( Operation *op, SlapReply *rs )
                return rc;
        } 
 
-       rc = LOCK_ID(bdb->bi_dbenv, &locker);
+       rc = bdb_reader_get(op, bdb->bi_dbenv, &rtxn);
        switch(rc) {
        case 0:
                break;
@@ -51,16 +51,21 @@ bdb_referrals( Operation *op, SlapReply *rs )
 
 dn2entry_retry:
        /* get entry */
-       rc = bdb_dn2entry( op, NULL, &op->o_req_ndn, &ei, 1, locker, &lock );
+       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;
+       }
 
-       e = ei->bei_e;
        switch(rc) {
        case DB_NOTFOUND:
        case 0:
                break;
        case LDAP_BUSY:
-               send_ldap_error( op, rs, LDAP_BUSY, "ldap server busy" );
-               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+               rs->sr_text = "ldap server busy";
                return LDAP_BUSY;
        case DB_LOCK_DEADLOCK:
        case DB_LOCK_NOTGRANTED:
@@ -70,50 +75,45 @@ dn2entry_retry:
                        LDAP_XSTRING(bdb_referrals)
                        ": dn2entry failed: %s (%d)\n",
                        db_strerror(rc), rc, 0 ); 
-               send_ldap_error( op, rs, LDAP_OTHER, "internal error" );
-               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
-               return rs->sr_err;
+               rs->sr_text = "internal error";
+               return LDAP_OTHER;
        }
 
        if ( rc == DB_NOTFOUND ) {
-               rc = 0;
+               rc = LDAP_SUCCESS;
                rs->sr_matched = NULL;
                if ( e != NULL ) {
                        Debug( LDAP_DEBUG_TRACE,
                                LDAP_XSTRING(bdb_referrals)
-                               ": op=%ld target=\"%s\" matched=\"%s\"\n",
-                               (long) op->o_tag, op->o_req_dn.bv_val, e->e_name.bv_val );
+                               ": 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( e ) ) {
+                               BerVarray ref = get_entry_referrals( op, e );
                                rc = LDAP_OTHER;
-                               rs->sr_ref = get_entry_referrals( op, e );
+                               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_cache_return_entry_r (bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
+                       bdb_cache_return_entry_r (bdb, e, &lock);
                        e = NULL;
-               } else if ( default_referral != NULL ) {
-                       rc = LDAP_OTHER;
-                       rs->sr_ref = referral_rewrite( default_referral,
-                               NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
                }
 
                if( rs->sr_ref != NULL ) {
                        /* send referrals */
-                       rs->sr_err = LDAP_REFERRAL;
+                       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 ) {
-                       rs->sr_err = rc;
                        rs->sr_text = rs->sr_matched ? "bad referral object" : NULL;
-                       send_ldap_result( op, rs );
                }
 
-               LOCK_ID_FREE ( bdb->bi_dbenv, locker );
                if (rs->sr_matched) {
                        op->o_tmpfree( (char *)rs->sr_matched, op->o_tmpmemctx );
                        rs->sr_matched = NULL;
@@ -129,8 +129,8 @@ dn2entry_retry:
 
                Debug( LDAP_DEBUG_TRACE,
                        LDAP_XSTRING(bdb_referrals)
-                       ": op=%ld target=\"%s\" matched=\"%s\"\n",
-                       (long) op->o_tag, op->o_req_dn.bv_val, e->e_name.bv_val );
+                       ": 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 ) {
@@ -139,15 +139,14 @@ dn2entry_retry:
                        ber_bvarray_free( rs->sr_ref );
                        rs->sr_ref = NULL;
                } else {
-                       send_ldap_error( op, rs, LDAP_OTHER, "bad referral object" );
-                       rc = rs->sr_err;
+                       rc = LDAP_OTHER;
+                       rs->sr_text = "bad referral object";
                }
 
                rs->sr_matched = NULL;
                ber_bvarray_free( refs );
        }
 
-       bdb_cache_return_entry_r(bdb->bi_dbenv, &bdb->bi_cache, e, &lock);
-       LOCK_ID_FREE ( bdb->bi_dbenv, locker );
+       bdb_cache_return_entry_r(bdb, e, &lock);
        return rc;
 }