r5104: - added support for task based servers. These are servers that within

  themselves are run as a single process, but run as a child of the
  main process when smbd is run in the standard model, and run as part
  of the main process when in the single mode.

- rewrote the winbind template code to use the new task services. Also
  fixed the packet queueing

- got rid of event_context_merge() as it is no longer needed
(This used to be commit 339964a596689278d2138cff05d7d444798a3504)

1 files changed, 15 insertions, 3 deletions

diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index d6217d87125..7d43855f6c1 100644
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -59,17 +59,29 @@ static void single_accept_connection(struct event_context *ev,
 	new_conn(ev, sock2, socket_get_fd(sock), private);
 }
 
+/*
+  called to startup a new task
+*/
+static void single_new_task(struct event_context *ev, 
+			    void (*new_task)(struct event_context *, uint32_t, void *), 
+			    void *private)
+{
+	static uint32_t taskid = 0x10000000;
+	new_task(ev, taskid++, private);
+}
+
 
-/* called when a connection goes down */
-static void single_terminate_connection(struct event_context *ev, const char *reason) 
+/* called when a task goes down */
+static void single_terminate(struct event_context *ev, const char *reason) 
 {
 }
 
 static const struct model_ops single_ops = {
 	.name			= "single",
 	.model_init		= single_model_init,
+	.new_task               = single_new_task,
 	.accept_connection	= single_accept_connection,
-	.terminate_connection	= single_terminate_connection,
+	.terminate              = single_terminate,
 };
 
 /*