ITS#6045: Use copy of db when testing filter in matchops.

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 9dc2dd5362086c82ba8f33938c6784d1fd3ab0b0..e0800f4ffc59fb7c3256f692f7ab3ae58afbc0ea 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -133,9 +133,10 @@ slap_req2res( ber_tag_t tag )
 }
 
 static long send_ldap_ber(
-       Connection *conn,
+       Operation *op,
        BerElement *ber )
 {
+       Connection *conn = op->o_conn;
        ber_len_t bytes;
        long ret = 0;
        int closing = 0;
@@ -144,7 +145,7 @@ static long send_ldap_ber(
 
        /* write only one pdu at a time - wait til it's our turn */
        ldap_pvt_thread_mutex_lock( &conn->c_write1_mutex );
-       if ( connection_state_closing( conn )) {
+       if ( op->o_abandon || connection_state_closing( conn )) {
                ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex );
                return 0;
        }
@@ -210,7 +211,7 @@ static long send_ldap_ber(
                /* wait for socket to be write-ready */
                ldap_pvt_thread_mutex_lock( &conn->c_write2_mutex );
                conn->c_writewaiter = 1;
-               slapd_set_write( conn->c_sd, 1 );
+               slapd_set_write( conn->c_sd, 2 );
 
                ldap_pvt_thread_mutex_unlock( &conn->c_write1_mutex );
                ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
@@ -532,7 +533,7 @@ send_ldap_response(
        }
 
        /* send BER */
-       bytes = send_ldap_ber( op->o_conn, ber );
+       bytes = send_ldap_ber( op, ber );
 #ifdef LDAP_CONNECTIONLESS
        if (!op->o_conn || op->o_conn->c_is_udp == 0)
 #endif
@@ -1243,7 +1244,7 @@ slap_send_search_entry( Operation *op, SlapReply *rs )
        }
 
        if ( op->o_res_ber == NULL ) {
-               bytes = send_ldap_ber( op->o_conn, ber );
+               bytes = send_ldap_ber( op, ber );
                ber_free_buf( ber );
 
                if ( bytes < 0 ) {
@@ -1416,7 +1417,7 @@ slap_send_search_reference( Operation *op, SlapReply *rs )
 #ifdef LDAP_CONNECTIONLESS
        if (!op->o_conn || op->o_conn->c_is_udp == 0) {
 #endif
-       bytes = send_ldap_ber( op->o_conn, ber );
+       bytes = send_ldap_ber( op, ber );
        ber_free_buf( ber );
 
        if ( bytes < 0 ) {
@@ -1656,9 +1657,9 @@ slap_attr_flags( AttributeName *an )
                flags |= ( SLAP_OPATTRS_NO | SLAP_USERATTRS_YES );
 
        } else {
-               flags |= an_find( an, &AllOper )
+               flags |= an_find( an, slap_bv_all_operational_attrs )
                        ? SLAP_OPATTRS_YES : SLAP_OPATTRS_NO;
-               flags |= an_find( an, &AllUser )
+               flags |= an_find( an, slap_bv_all_user_attrs )
                        ? SLAP_USERATTRS_YES : SLAP_USERATTRS_NO;
        }