ITS#2921, fix client connection handling for HAVE_WINSOCK

diff --git a/servers/slapd/connection.c b/servers/slapd/connection.c
index 55bff400b9afabd4b5d133c3413f8bfaa174e2e0..ce61d3c30d4aa3c0b8910b065f78ed44dee0c1b5 100644 (file)
--- a/servers/slapd/connection.c
+++ b/servers/slapd/connection.c
@@ -321,7 +321,6 @@ static Connection* connection_get( ber_socket_t s )
                        ldap_pvt_thread_mutex_unlock( &c->c_mutex );
                        return NULL;
                }
-               if( c->c_conn_state == SLAP_C_CLIENT ) sd = 0;
 
 #ifdef NEW_LOGGING
                LDAP_LOG( CONNECTION, RESULTS, 
@@ -424,6 +423,10 @@ long connection_init(
                                break;
                        }
 
+                       if( connections[i].c_conn_state == SLAP_C_CLIENT ) {
+                               continue;
+                       }
+
                        assert( connections[i].c_struct_state == SLAP_C_USED );
                        assert( connections[i].c_conn_state != SLAP_C_INVALID );
                        assert( sd != AC_SOCKET_INVALID );
@@ -528,6 +531,7 @@ long connection_init(
        if ( flags == CONN_IS_CLIENT ) {
                c->c_conn_state = SLAP_C_CLIENT;
                c->c_struct_state = SLAP_C_USED;
+               ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_FD, &s );
                ldap_pvt_thread_mutex_unlock( &c->c_mutex );
                ldap_pvt_thread_mutex_unlock( &connections_mutex );