s/managedit/relax/

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

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index f7e1667e2c761c1719c387de0b4d76ffff705204..97d4ee2c7a87d6cfd5025e03a383ce0090968840 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -203,7 +203,8 @@ ldap_back_search(
        }
 
        ctrls = op->o_ctrls;
-       rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn, op, rs, &ctrls );
+       rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn,
+               li->li_version, &li->li_idassert, op, rs, &ctrls );
        if ( rc != LDAP_SUCCESS ) {
                goto finish;
        }
@@ -419,9 +420,7 @@ retry:
                        }
 
                        if ( match.bv_val != NULL ) {
-                               {
-                                       match.bv_len = strlen( match.bv_val );
-                               }
+                               match.bv_len = strlen( match.bv_val );
                        }
 
                        /* cleanup */
@@ -470,7 +469,11 @@ finish:;
                ldap_back_quarantine( op, rs );
        }
 
-       if ( rc != SLAPD_ABANDON ) {
+#if 0
+       /* let send_ldap_result play cleanup handlers (ITS#4645) */
+       if ( rc != SLAPD_ABANDON )
+#endif
+       {
                send_ldap_result( op, rs );
        }
 
@@ -710,9 +713,10 @@ ldap_back_entry_get(
                ObjectClass             *oc,
                AttributeDescription    *at,
                int                     rw,
-               Entry                   **ent
-)
+               Entry                   **ent )
 {
+       ldapinfo_t      *li = (ldapinfo_t *) op->o_bd->be_private;
+
        ldapconn_t      *lc;
        int             rc = 1,
                        do_not_cache;
@@ -762,7 +766,8 @@ ldap_back_entry_get(
        }
 
        ctrls = op->o_ctrls;
-       rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn, op, &rs, &ctrls );
+       rc = ldap_back_proxy_authz_ctrl( &lc->lc_bound_ndn,
+               li->li_version, &li->li_idassert, op, &rs, &ctrls );
        if ( rc != LDAP_SUCCESS ) {
                goto cleanup;
        }