sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-08-02 00:22:11 +03:00
Code Activity

r11982: ensure the fde event gets freed before the socket itself, as otherwise

Browse Source 
we get a error from epoll about disabling events for a file descriptor
that is closed
(This used to be commit f327393074)
This commit is contained in:
Andrew Tridgell
2005-12-01 00:22:08 +00:00
committed by Gerald (Jerry) Carter
parent 7d960dfc39
commit f5d4623ea5
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
source4/libcli/raw/clisocket.c
View File

@ -179,10 +179,10 @@ NTSTATUS smbcli_sock_connect(TALLOC_CTX *mem_ctx,
****************************************************************************/
void smbcli_sock_dead(struct smbcli_socket *sock)
{
if (sock->sock != NULL) {
talloc_free(sock->sock);
sock->sock = NULL;
}
talloc_free(sock->event.fde);
sock->event.fde = NULL;
talloc_free(sock->sock);
sock->sock = NULL;
}
/****************************************************************************

2
source4/libcli/raw/clitransport.c
View File

@ -115,7 +115,7 @@ struct smbcli_transport *smbcli_transport_init(struct smbcli_socket *sock,
handles events up until we are connected */
talloc_free(transport->socket->event.fde);
transport->socket->event.fde = event_add_fd(transport->socket->event.ctx,
transport->socket,
transport->socket->sock,
socket_get_fd(transport->socket->sock),
EVENT_FD_READ,
smbcli_transport_event_handler,