ITS#5328: Make relay_back_has_subordinates() return failure on failure

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index 9dc2dd5362086c82ba8f33938c6784d1fd3ab0b0..8bbddad96f2e0af28c724dc3491b9ea4072e4686 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 && !op->o_cancel ) || !connection_valid( 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 );
@@ -414,7 +415,7 @@ send_ldap_response(
        int             rc = LDAP_SUCCESS;
        long    bytes;
 
-       if ( rs->sr_err == SLAPD_ABANDON || op->o_abandon ) {
+       if (( rs->sr_err == SLAPD_ABANDON || op->o_abandon ) && !op->o_cancel ) {
                rc = SLAPD_ABANDON;
                goto clean2;
        }
@@ -436,9 +437,13 @@ send_ldap_response(
                ber_set_option( ber, LBER_OPT_BER_MEMCTX, &op->o_tmpmemctx );
        }
 
+       rc = rs->sr_err;
+       if ( rc == SLAPD_ABANDON && op->o_cancel )
+               rc = LDAP_CANCELLED;
+
        Debug( LDAP_DEBUG_TRACE,
                "send_ldap_response: msgid=%d tag=%lu err=%d\n",
-               rs->sr_msgid, rs->sr_tag, rs->sr_err );
+               rs->sr_msgid, rs->sr_tag, rc );
 
        if( rs->sr_ref ) {
                Debug( LDAP_DEBUG_ARGS, "send_ldap_response: ref=\"%s\"\n",
@@ -462,7 +467,7 @@ send_ldap_response(
 
        } else {
            rc = ber_printf( ber, "{it{ess" /*"}}"*/,
-               rs->sr_msgid, rs->sr_tag, rs->sr_err,
+               rs->sr_msgid, rs->sr_tag, rc,
                rs->sr_matched == NULL ? "" : rs->sr_matched,
                rs->sr_text == NULL ? "" : rs->sr_text );
        }
@@ -532,7 +537,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 +1248,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 +1421,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 +1661,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;
        }