upstream/openldap
1
0
Fork 0
mirror of https://git.openldap.org/openldap/openldap.git synced 2026-01-06 06:59:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix TLS/SASL handling in new lightweight dispatcher

Browse source
This commit is contained in:
Kurt Zeilenga 2005-10-16 20:33:01 +00:00
parent 24efc30873
commit 964aa48c37
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
servers/slapd/connection.c
View file

@ -1517,7 +1517,7 @@ int connection_read(ber_socket_t s)
rc = ldap_pvt_tls_accept( c->c_sb, slap_tls_ctx );
if ( rc < 0 ) {
Debug( LDAP_DEBUG_TRACE,
"connection_read(%d): TLS accept error "
"connection_read(%d): TLS accept failure "
"error=%d id=%lu, closing\n",
s, rc, c->c_connid );
@ -1578,7 +1578,7 @@ int connection_read(ber_socket_t s)
!ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_DATA_READY, NULL ) )
{
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_set_read( s, 1 );
if( rc == 0 ) slapd_set_read( s, 1 );
#endif
connection_return( c );
@ -1611,11 +1611,6 @@ int connection_read(ber_socket_t s)
s, rc, c->c_connid );
/* connections_mutex and c_mutex are locked */
#ifdef SLAP_LIGHTWEIGHT_DISPATCHER
slapd_set_read( s, 1 );
#endif
connection_closing( c, "SASL layer install failure" );
connection_close( c );
connection_return( c );