add return-error support to searches

diff --git a/servers/slapd/back-ldap/chain.c b/servers/slapd/back-ldap/chain.c
index 054f0b8ae8b861ba888c24f4644d56b2169a495f..c0707c16a273a153e6fe013bac6dd4e1f7ab2f98 100644 (file)
--- a/servers/slapd/back-ldap/chain.c
+++ b/servers/slapd/back-ldap/chain.c
@@ -554,7 +554,8 @@ ldap_chain_search(
                        ondn = op->o_req_ndn;
        slap_response   *save_response = op->o_callback->sc_response;
 
-       int             rc = LDAP_OTHER;
+       int             rc = LDAP_OTHER,
+                       first_rc = -1;
 
 #ifdef LDAP_CONTROL_X_CHAINING_BEHAVIOR
        LDAPControl     **ctrls = NULL;
@@ -658,6 +659,9 @@ ldap_chain_search(
                /* FIXME: should we also copy filter and scope?
                 * according to RFC3296, no */
                rc = lback->bi_op_search( op, rs );
+               if ( first_rc == -1 ) {
+                       first_rc = rc;
+               }
 
 cleanup:;
                ldap_memfree( li.li_uri );
@@ -692,7 +696,12 @@ cleanup:;
 
        if ( rc != LDAP_SUCCESS ) {
                /* couldn't chase any of the referrals */
-               rc = SLAP_CB_CONTINUE;
+               if ( first_rc != -1 ) {
+                       rc = first_rc;
+
+               } else {
+                       rc = SLAP_CB_CONTINUE;
+               }
        }
 
        return rc;