Rework ac/socket.h for HAVE_WINSOCK:

[openldap] / servers / slapd / result.c

diff --git a/servers/slapd/result.c b/servers/slapd/result.c
index c79d6de627070a2d3993d029d96b9a3992a40b10..311a355f18a94d64bb7fa1b9d989838f8856761a 100644 (file)
--- a/servers/slapd/result.c
+++ b/servers/slapd/result.c
@@ -104,7 +104,7 @@ send_ldap_result2(
                    : "unknown", 0 );
 
                if ( errno != EWOULDBLOCK && errno != EAGAIN ) {
-                       conn->c_conn_state = SLAP_C_CLOSING;
+                       connection_closing( conn );
 
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
                        ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
@@ -122,11 +122,9 @@ send_ldap_result2(
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
        ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
 
-#ifdef LDAP_COUNTERS
        ldap_pvt_thread_mutex_lock( &num_sent_mutex );
        num_bytes_sent += bytes;
        ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
-#endif
 
        Statslog( LDAP_DEBUG_STATS,
            "conn=%d op=%d RESULT err=%d tag=%lu nentries=%d\n", conn->c_connid,
@@ -334,7 +332,7 @@ send_search_entry(
                    : "unknown", 0 );
 
                if ( errno != EWOULDBLOCK && errno != EAGAIN ) {
-                       conn->c_conn_state = SLAP_C_CLOSING;
+                       connection_closing( conn );
 
                        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
                        ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
@@ -352,12 +350,10 @@ send_search_entry(
        ldap_pvt_thread_mutex_unlock( &conn->c_mutex );
        ldap_pvt_thread_mutex_unlock( &conn->c_write_mutex );
 
-#ifdef LDAP_COUNTERS
        ldap_pvt_thread_mutex_lock( &num_sent_mutex );
        num_bytes_sent += bytes;
        num_entries_sent++;
        ldap_pvt_thread_mutex_unlock( &num_sent_mutex );
-#endif
 
        Statslog( LDAP_DEBUG_STATS2, "conn=%d op=%d ENTRY dn=\"%s\"\n",
            conn->c_connid, op->o_opid, e->e_dn, 0, 0 );