fix controls run-time registered by global overlays (kludge non longer required?)

[openldap] / servers / slapd / back-ldap / compare.c

diff --git a/servers/slapd/back-ldap/compare.c b/servers/slapd/back-ldap/compare.c
index 3ce083f724560c59c1e6f5ddc497838b4898e21c..a538e3d4b27cb9ea94822dcd77c7463f1ea161a6 100644 (file)
--- a/servers/slapd/back-ldap/compare.c
+++ b/servers/slapd/back-ldap/compare.c
@@ -42,39 +42,33 @@ ldap_back_compare(
        LDAPControl     **ctrls = NULL;
        int             rc = LDAP_SUCCESS;
 
-       lc = ldap_back_getconn( op, rs );
-       if (!lc || !ldap_back_dobind( lc, op, rs ) ) {
-               rc = -1;
+       lc = ldap_back_getconn( op, rs, LDAP_BACK_SENDERR );
+       if ( !lc || !ldap_back_dobind( lc, op, rs, LDAP_BACK_SENDERR ) ) {
                goto cleanup;
        }
 
        ctrls = op->o_ctrls;
-#ifdef LDAP_BACK_PROXY_AUTHZ
        rc = ldap_back_proxy_authz_ctrl( lc, op, rs, &ctrls );
        if ( rc != LDAP_SUCCESS ) {
                send_ldap_result( op, rs );
-               rc = -1;
                goto cleanup;
        }
-#endif /* LDAP_BACK_PROXY_AUTHZ */
 
 retry:
        rs->sr_err = ldap_compare_ext( lc->lc_ld, op->o_req_ndn.bv_val,
                        op->orc_ava->aa_desc->ad_cname.bv_val,
                        &op->orc_ava->aa_value, 
                        ctrls, NULL, &msgid );
-       rc = ldap_back_op_result( lc, op, rs, msgid, 1 );
-       if ( rs->sr_err == LDAP_UNAVAILABLE && do_retry ) {
+       rc = ldap_back_op_result( lc, op, rs, msgid, LDAP_BACK_SENDRESULT );
+       if ( rc == LDAP_UNAVAILABLE && do_retry ) {
                do_retry = 0;
-               if ( ldap_back_retry(lc, op, rs ) ) {
+               if ( ldap_back_retry( lc, op, rs, LDAP_BACK_SENDERR ) ) {
                        goto retry;
                }
        }
 
 cleanup:
-#ifdef LDAP_BACK_PROXY_AUTHZ
        (void)ldap_back_proxy_authz_ctrl_free( op, &ctrls );
-#endif /* LDAP_BACK_PROXY_AUTHZ */
        
-       return rc;
+       return rs->sr_err;
 }