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

Move socket close into slapd_remove, don't close until after socket

Browse source 
is removed from daemon control.
This commit is contained in:
Howard Chu 2006-08-17 00:44:38 +00:00
parent 8e5699e60f
commit 098153c5bb
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
servers/slapd/connection.c
View file

@ -653,7 +653,7 @@ void connection2anonymous( Connection *c )
static void
connection_destroy( Connection *c )
{
ber_socket_t sd;
ber_socket_t sd, inval = AC_SOCKET_INVALID;
unsigned long connid;
const char *close_reason;
Sockbuf *sb;
@ -733,6 +733,7 @@ connection_destroy( Connection *c )
ber_sockbuf_ctrl( sb, LBER_SB_OPT_GET_FD, &sd );
slapd_sd_lock();
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_FD, &inval );
ber_sockbuf_free( sb );
/* c must be fully reset by this point; when we call slapd_remove
@ -1218,6 +1219,7 @@ void connection_client_stop(
ber_socket_t s )
{
Connection *c;
ber_socket_t inval = AC_SOCKET_INVALID;
/* get (locked) connection */
c = connection_get( s );
@ -1229,6 +1231,7 @@ void connection_client_stop(
c->c_struct_state = SLAP_C_UNUSED;
c->c_close_reason = "?"; /* should never be needed */
slapd_sd_lock();
ber_sockbuf_ctrl( c->c_sb, LBER_SB_OPT_SET_FD, &inval );
ber_sockbuf_free( c->c_sb );
slapd_remove( s, 0, 1, 1 );
c->c_sb = ber_sockbuf_alloc( );

2
servers/slapd/daemon.c
View file

@ -527,6 +527,8 @@ void slapd_remove(
SLAP_DEL_SOCK(s);
tcp_close(s);
/* If we ran out of file descriptors, we dropped a listener from
* the select() loop. Now that we're removing a session from our
* control, we can try to resume a dropped listener to use.