summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2005-10-03 09:36:52 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:39:18 -0500
commit28bc38de2ab3a408702cd7d6b69d6549a1fea71a (patch)
treea9f5c50a401b3444948735c5685d40ad47e9538a /source4
parentaea73c168b793f54b17509c3d3d8cdae042bc6ef (diff)
downloadsamba-28bc38de2ab3a408702cd7d6b69d6549a1fea71a.tar.gz
samba-28bc38de2ab3a408702cd7d6b69d6549a1fea71a.tar.bz2
samba-28bc38de2ab3a408702cd7d6b69d6549a1fea71a.zip
r10682: force the free of the fd event first when a stream terminates. That ensures
destructors hanging off the stream connection don't trip more socket events. this should help with the problem volker described (This used to be commit fd8eccd5bf0c742a7809f3991101f4ac75b5e037)
Diffstat (limited to 'source4')
-rw-r--r--source4/smbd/service_stream.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 3cecd8076e..1ed8b4d8af 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -55,6 +55,7 @@ void stream_terminate_connection(struct stream_connection *srv_conn, const char
{
struct event_context *event_ctx = srv_conn->event.ctx;
const struct model_ops *model_ops = srv_conn->model_ops;
+ talloc_free(srv_conn->event.fde);
talloc_free(srv_conn);
model_ops->terminate(event_ctx, reason);
}