diff options
| author | Stefan Metzmacher <metze@samba.org> | 2004-07-15 09:43:32 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 12:57:38 -0500 |
| commit | 7a0e61f38ea6b13f1f45e89f6f160d6c32f08617 (patch) | |
| tree | f23d46549ac59b97ecd78fec2f4747c2c4c737dc /source4/smbd/service.c | |
| parent | b11e1a41d8bc30d1849e95bf47b84a081570bd07 (diff) | |
| download | samba-7a0e61f38ea6b13f1f45e89f6f160d6c32f08617.tar.gz samba-7a0e61f38ea6b13f1f45e89f6f160d6c32f08617.tar.bz2 samba-7a0e61f38ea6b13f1f45e89f6f160d6c32f08617.zip | |
r1516: remove the server_connection from the list on the server_socket
and call talloc_destroy(srv_conn->mem_ctx)
also don't follow NULL pointers
metze
(This used to be commit 786c00c3d4f510c870a45f11af69281298ba176d)
Diffstat (limited to 'source4/smbd/service.c')
| -rw-r--r-- | source4/smbd/service.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/source4/smbd/service.c b/source4/smbd/service.c index d225a69b17..c90792e452 100644 --- a/source4/smbd/service.c +++ b/source4/smbd/service.c @@ -247,8 +247,11 @@ void server_terminate_connection(struct server_connection *srv_conn, const char void server_destroy_connection(struct server_connection *srv_conn) { close(srv_conn->event.fde->fd); + event_remove_fd(srv_conn->event.ctx, srv_conn->event.fde); event_remove_timed(srv_conn->event.ctx, srv_conn->event.idle); + + talloc_destroy(srv_conn->mem_ctx); } void server_io_handler(struct event_context *ev, struct fd_event *fde, time_t t, uint16_t flags) |