line up with HEAD (ready for release)

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

diff --git a/servers/slapd/back-ldap/search.c b/servers/slapd/back-ldap/search.c
index b27d39795ce35b3a2fa6655dd39ac024a8105e1f..75bceebbf8f1c9a0008746f305869379038f4608 100644 (file)
--- a/servers/slapd/back-ldap/search.c
+++ b/servers/slapd/back-ldap/search.c
@@ -264,7 +264,7 @@ retry:
        for ( rc = 0; rc != -1; rc = ldap_result( lc->lc_ld, msgid, LDAP_MSG_ONE, &tv, &res ) )
        {
                /* check for abandon */
-               if ( op->o_abandon ) {
+               if ( op->o_abandon || LDAP_BACK_CONN_ABANDON( lc ) ) {
                        if ( rc > 0 ) {
                                ldap_msgfree( res );
                        }
@@ -535,7 +535,7 @@ finish:;
        }
 
        if ( lc != NULL ) {
-               ldap_back_release_conn( op, rs, lc );
+               ldap_back_release_conn( li, lc );
        }
 
        return rs->sr_err;
@@ -822,7 +822,7 @@ retry:
        rc = ldap_build_entry( op, e, *ent, &bdn );
 
        if ( rc != LDAP_SUCCESS ) {
-               ch_free( *ent );
+               entry_free( *ent );
                *ent = NULL;
        }
 
@@ -838,7 +838,7 @@ cleanup:
        }
 
        if ( lc != NULL ) {
-               ldap_back_release_conn( op, &rs, lc );
+               ldap_back_release_conn( li, lc );
        }
 
        return rc;