ITS#5959, cleanup

[openldap] / servers / slapd / back-relay / op.c

diff --git a/servers/slapd/back-relay/op.c b/servers/slapd/back-relay/op.c
index 7c453af925bdbbfcdbec5a1b75f1109ab9a5319b..4c28483d92a6c711aa6d569730adaf2acf93eb8d 100644 (file)
--- a/servers/slapd/back-relay/op.c
+++ b/servers/slapd/back-relay/op.c
@@ -1,7 +1,8 @@
 /* op.c - relay backend operations */
+/* $OpenLDAP$ */
 /* This work is part of OpenLDAP Software <http://www.openldap.org/>.
  *
- * Copyright 2004-2008 The OpenLDAP Foundation.
+ * Copyright 2004-2009 The OpenLDAP Foundation.
  * Portions Copyright 2004 Pierangelo Masarati.
  * All rights reserved.
  *
@@ -73,7 +74,7 @@ relay_back_select_backend( Operation *op, SlapReply *rs, slap_mask_t fail_mode )
 
        if ( bd == NULL && !BER_BVISNULL( &op->o_req_ndn ) ) {
                bd = select_backend( &op->o_req_ndn, 1 );
-               if ( bd == op->o_bd ) {
+               if ( bd->be_private == op->o_bd->be_private ) {
                        Debug( LDAP_DEBUG_ANY,
                                "%s: back-relay for DN=\"%s\" would call self.\n",
                                op->o_log_prefix, op->o_req_dn.bv_val, 0 );
@@ -431,7 +432,7 @@ relay_back_chk_referrals( Operation *op, SlapReply *rs )
                }
        }
 
-       return relay_back_op( op, rs, bd, bd->be_chk_referrals, 0 );
+       return relay_back_op( op, rs, bd, bd->be_chk_referrals, LDAP_SUCCESS );
 }
 
 int