2 files changed, 30 insertions, 6 deletions

diff --git a/source4/smbd/service_stream.c b/source4/smbd/service_stream.c
index 6f78643dae..b3d5fefb99 100644
--- a/source4/smbd/service_stream.c
+++ b/source4/smbd/service_stream.c
@@ -55,7 +55,24 @@ 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;
+
+	if (!reason) reason = "unknwon reason";
+
+	srv_conn->terminate = reason;
+
+	if (srv_conn->processing) {
+		/* 
+		 * if we're currently inside the stream_io_handler(),
+		 * deferr the termination to the end of stream_io_hendler()
+		 *
+		 * and we don't want to read or write to the connection...
+		 */
+		event_set_fd_flags(srv_conn->event.fde, 0);
+		return;
+	}
+
 	talloc_free(srv_conn->event.fde);
+	srv_conn->event.fde = NULL;
 	talloc_free(srv_conn);
 	model_ops->terminate(event_ctx, reason);
 }
@@ -68,13 +85,17 @@ static void stream_io_handler(struct event_context *ev, struct fd_event *fde,
 {
 	struct stream_connection *conn = talloc_get_type(private, 
 							 struct stream_connection);
+
+	conn->processing = True;
 	if (flags & EVENT_FD_WRITE) {
 		conn->ops->send_handler(conn, flags);
-		return;
+	} else if (flags & EVENT_FD_READ) {
+		conn->ops->recv_handler(conn, flags);
 	}
+	conn->processing = False;
 
-	if (flags & EVENT_FD_READ) {
-		conn->ops->recv_handler(conn, flags);
+	if (conn->terminate) {
+		stream_terminate_connection(conn, conn->terminate);
 	}
 }
 
diff --git a/source4/smbd/service_stream.h b/source4/smbd/service_stream.h
index 3ae7107419..6f1a967237 100644
--- a/source4/smbd/service_stream.h
+++ b/source4/smbd/service_stream.h
@@ -23,10 +23,10 @@
 
 /* modules can use the following to determine if the interface has changed
  * please increment the version number after each interface change
- * with a comment and maybe update struct process_model_critical_sizes.
+ * with a comment and maybe update struct stream_connection_critical_sizes.
  */
-/* version 1 - initial version - metze */
-#define SERVER_SERVICE_VERSION 1
+/* version 0 - initial version - metze */
+#define SERVER_SERVICE_VERSION 0
 
 /*
   top level context for an established stream connection
@@ -44,6 +44,9 @@ struct stream_connection {
 
 	struct socket_context *socket;
 	struct messaging_context *msg_ctx;
+
+	BOOL processing;
+	const char *terminate;
 };