fix referral return in back-ldbm as well (same as ITS#3475)

diff --git a/servers/slapd/back-ldbm/referral.c b/servers/slapd/back-ldbm/referral.c
index e157ae1fa0259bd64f736d3ef61a69d56c244ae8..14838296209fa03101d31bf477c762e7f7d649cf 100644 (file)
--- a/servers/slapd/back-ldbm/referral.c
+++ b/servers/slapd/back-ldbm/referral.c
@@ -30,7 +30,8 @@ ldbm_back_referrals(
     SlapReply  *rs )
 {
        struct ldbminfo *li = (struct ldbminfo *) op->o_bd->be_private;
-       Entry *e, *matched;
+       Entry           *e, *matched;
+       int             rc = LDAP_SUCCESS;
 
        if( op->o_tag == LDAP_REQ_SEARCH ) {
                /* let search take care of itself */
@@ -55,36 +56,37 @@ ldbm_back_referrals(
                                "ldbm_referrals: op=%ld target=\"%s\" matched=\"%s\"\n",
                                op->o_tag, op->o_req_dn.bv_val, rs->sr_matched );
 
-                       if( is_entry_referral( matched ) ) {
-                               rs->sr_err = LDAP_OTHER;
+                       if ( is_entry_referral( matched ) ) {
+                               rc = rs->sr_err = LDAP_OTHER;
                                rs->sr_ref = get_entry_referrals( op, matched );
                        }
 
                        cache_return_entry_r( &li->li_cache, matched );
 
                } else if ( default_referral != NULL ) {
-                       rs->sr_err = LDAP_OTHER;
                        rs->sr_ref = referral_rewrite( default_referral,
                                NULL, &op->o_req_dn, LDAP_SCOPE_DEFAULT );
                }
 
                ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
 
-               if( rs->sr_ref != NULL ) {
+               if ( rs->sr_ref != NULL ) {
                        /* send referrals */
-                       rs->sr_err = LDAP_REFERRAL;
-                       send_ldap_result( op, rs );
-                       ber_bvarray_free( rs->sr_ref );
+                       rc = rs->sr_err = LDAP_REFERRAL;
 
-               } else if ( rs->sr_err != LDAP_SUCCESS ) {
+               } else {
                        rs->sr_text = rs->sr_matched ? "bad referral object" : "bad default referral";
-                       send_ldap_result( op, rs );
                }
 
+               send_ldap_result( op, rs );
+
                if ( rs->sr_matched ) free( (char *)rs->sr_matched );
+               if ( rs->sr_ref ) ber_bvarray_free( rs->sr_ref );
+               rs->sr_text = NULL;
                rs->sr_ref = NULL;
                rs->sr_matched = NULL;
-               return rs->sr_err;
+
+               return rc;
        }
 
        if ( is_entry_referral( e ) ) {
@@ -99,23 +101,24 @@ ldbm_back_referrals(
 
                rs->sr_matched = e->e_name.bv_val;
                if( rs->sr_ref != NULL ) {
-                       rs->sr_err = LDAP_REFERRAL;
-                       send_ldap_result( op, rs );
-
-                       ber_bvarray_free( rs->sr_ref );
+                       rc = rs->sr_err = LDAP_REFERRAL;
+                       rs->sr_text = NULL;
 
                } else {
-                       send_ldap_error( op, rs, LDAP_OTHER,
-                               "bad referral object" );
+                       rc = rs->sr_err = LDAP_OTHER;
+                       rs->sr_text = "bad referral object";
                }
+               send_ldap_result( op, rs );
 
-               if( refs != NULL ) ber_bvarray_free( refs );
+               if ( refs != NULL ) ber_bvarray_free( refs );
+               rs->sr_err = rc;
                rs->sr_ref = NULL;
+               rs->sr_text = NULL;
                rs->sr_matched = NULL;
        }
 
        cache_return_entry_r( &li->li_cache, e );
        ldap_pvt_thread_rdwr_runlock(&li->li_giant_rwlock);
 
-       return rs->sr_err;
+       return rc;
 }