- we now specify the object files in the subsystems config.m4 file

  I plan to convert all objectfile group to use SMB_SUBSYSTEM
  later I'll add a SMB_BINARY() and SMB_LIBRARY(), then there will be no more need
  to touch Makefile.in, because all make rules will be autogenerated by configure

- convert the PROCESS_MODEL subsystem to this new scheme
  and move the pthread test to smbd/process_model.m4

- convert the CHARSET subsystem to this new scheme
  and move the iconv test to lib/iconv.m4
(This used to be commit 2e57ee884ebea194ee79ac20e84e385481b56aa2)

1 files changed, 21 insertions, 7 deletions

diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index bd64166355..dcd2f456af 100644
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -465,25 +465,39 @@ static void model_startup(void)
 	register_debug_handlers("thread", &d_ops);	
 }
 
+static void thread_exit_server(struct server_context *smb, const char *reason)
+{
+	DEBUG(1,("thread_exit_server: reason[%s]\n",reason));
+}
+
 /*
   initialise the thread process model, registering ourselves with the model subsystem
  */
-void process_model_thread_init(void)
+NTSTATUS process_model_thread_init(void)
 {
+	NTSTATUS ret;
 	struct model_ops ops;
 
 	ZERO_STRUCT(ops);
-	
+
+	/* fill in our name */
+	ops.name = "thread";
+
 	/* fill in all the operations */
 	ops.model_startup = model_startup;
 	ops.accept_connection = accept_connection;
 	ops.accept_rpc_connection = accept_rpc_connection;
 	ops.terminate_connection = terminate_connection;
 	ops.terminate_rpc_connection = terminate_rpc_connection;
-	ops.exit_server = NULL;
+	ops.exit_server = thread_exit_server;
 	ops.get_id = get_id;
-	
-	/* register ourselves with the process model subsystem. We
-	   register under the name 'thread'. */
-	register_process_model("thread", &ops);
+
+	/* register ourselves with the PROCESS_MODEL subsystem. */
+	ret = register_backend("process_model", &ops);
+	if (!NT_STATUS_IS_OK(ret)) {
+		DEBUG(0,("Failed to register process_model 'thread'!\n"));
+		return ret;
+	}
+
+	return ret;
 }