Commit 8099a102 authored by Kurt Zeilenga's avatar Kurt Zeilenga
Browse files

Sync with HEAD

parent 77f5cdfc
...@@ -1158,6 +1158,13 @@ void connection_client_stop( ...@@ -1158,6 +1158,13 @@ void connection_client_stop(
c->c_conn_state = SLAP_C_INVALID; c->c_conn_state = SLAP_C_INVALID;
c->c_struct_state = SLAP_C_UNUSED; c->c_struct_state = SLAP_C_UNUSED;
c->c_close_reason = "?"; /* should never be needed */ c->c_close_reason = "?"; /* should never be needed */
ber_sockbuf_free( c->c_sb );
c->c_sb = ber_sockbuf_alloc( );
{
ber_len_t max = sockbuf_max_incoming;
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_MAX_INCOMING, &max );
}
connection_return( c ); connection_return( c );
slapd_remove( s, 0, 1 ); slapd_remove( s, 0, 1 );
} }
...@@ -1262,8 +1269,8 @@ int connection_read(ber_socket_t s) ...@@ -1262,8 +1269,8 @@ int connection_read(ber_socket_t s)
s, rc, c->c_connid ); s, rc, c->c_connid );
} }
Statslog( LDAP_DEBUG_STATS, Statslog( LDAP_DEBUG_STATS,
"conn=%lu TLS established tls_ssf=%u ssf=%u\n", "conn=%lu fd=%d TLS established tls_ssf=%u ssf=%u\n",
c->c_connid, c->c_tls_ssf, c->c_ssf, 0, 0 ); c->c_connid, (int) s, c->c_tls_ssf, c->c_ssf, 0 );
slap_sasl_external( c, c->c_tls_ssf, &authid ); slap_sasl_external( c, c->c_tls_ssf, &authid );
if ( authid.bv_val ) free( authid.bv_val ); if ( authid.bv_val ) free( authid.bv_val );
} }
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment