summaryrefslogtreecommitdiff
path: root/source4/smbd
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-02-03 08:20:31 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:09:29 -0500
commita097414ed25873cbcbee48f0a888d36a6b60c10c (patch)
tree4a51770982ac40e4ce06e156d9b1da361d9dcd08 /source4/smbd
parentc3f8ef9424f5c75ba7d6e85904fc4a4f2e2085d5 (diff)
downloadsamba-a097414ed25873cbcbee48f0a888d36a6b60c10c.tar.gz
samba-a097414ed25873cbcbee48f0a888d36a6b60c10c.tar.bz2
samba-a097414ed25873cbcbee48f0a888d36a6b60c10c.zip
r5193: make sure we mark the event dead when we free it on a dead connection
(This used to be commit 90535bab957ddaa7bfcdf43e199581f3352bdc8a)
Diffstat (limited to 'source4/smbd')
-rw-r--r--source4/smbd/service_stream.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 60a4c5feca..00fd9c470a 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -97,10 +97,10 @@ static void stream_new_connection(struct event_context *ev,
srv_conn->private = stream_socket->private;
srv_conn->model_ops = stream_socket->model_ops;
- srv_conn->event.ctx = ev;
srv_conn->socket = sock;
srv_conn->server_id = server_id;
srv_conn->ops = stream_socket->ops;
+ srv_conn->event.ctx = ev;
srv_conn->event.fde = event_add_fd(ev, srv_conn, socket_get_fd(sock),
EVENT_FD_READ,
stream_io_handler, srv_conn);