From 31ded4901b4529ad2e49871502cab5ecba71483a Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 14 Nov 2004 22:23:23 +0000
Subject: r3737: - Get rid of the register_subsystem() and register_backend()
 functions. - Re-disable tdbtool (it was building fine on my Debian box but
 other 					machines were having problems) (This
 used to be commit 0d7bb2c40b7a9ed59df3f8944133ea562697e814)

---
 source4/smbd/config.mk          |  1 -
 source4/smbd/process_model.c    | 20 +-------------------
 source4/smbd/process_model.mk   |  1 -
 source4/smbd/process_single.c   |  2 +-
 source4/smbd/process_standard.c |  2 +-
 source4/smbd/process_thread.c   |  2 +-
 source4/smbd/service.c          | 21 +--------------------
 7 files changed, 5 insertions(+), 44 deletions(-)

(limited to 'source4/smbd')

diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index 52e8e69c30..df421326d8 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -43,7 +43,6 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM SERVICE
 [SUBSYSTEM::SERVER_SERVICE]
-INIT_FUNCTION = server_service_init
 INIT_OBJ_FILES = \
 		smbd/service.o
 REQUIRED_SUBSYSTEMS = \
diff --git a/source4/smbd/process_model.c b/source4/smbd/process_model.c
index 69e321e0c2..2a3efe2088 100644
--- a/source4/smbd/process_model.c
+++ b/source4/smbd/process_model.c
@@ -54,7 +54,7 @@ static int num_models;
   The 'name' can be later used by other backends to find the operations
   structure for this backend.  
 */
-static NTSTATUS register_process_model(const void *_ops)
+NTSTATUS register_process_model(const void *_ops)
 {
 	const struct model_ops *ops = _ops;
 
@@ -114,21 +114,3 @@ const struct process_model_critical_sizes *process_model_version(void)
 
 	return &critical_sizes;
 }
-
-/*
-  initialise the PROCESS_MODEL subsystem
-*/
-NTSTATUS process_model_init(void)
-{
-	NTSTATUS status;
-
-	status = register_subsystem("process_model", register_process_model); 
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	process_model_init_static_modules;
-
-	DEBUG(3,("PROCESS subsystem version %d initialised\n", PROCESS_MODEL_VERSION));
-	return NT_STATUS_OK; 
-}
diff --git a/source4/smbd/process_model.mk b/source4/smbd/process_model.mk
index 70ccddd828..f110cbb8fa 100644
--- a/source4/smbd/process_model.mk
+++ b/source4/smbd/process_model.mk
@@ -34,7 +34,6 @@ REQUIRED_SUBSYSTEMS = EXT_LIB_PTHREAD
 ################################################
 # Start SUBSYSTEM PROCESS_MODEL
 [SUBSYSTEM::PROCESS_MODEL]
-INIT_FUNCTION = process_model_init
 INIT_OBJ_FILES = \
 		smbd/process_model.o
 #
diff --git a/source4/smbd/process_single.c b/source4/smbd/process_single.c
index 02d025b29c..da23470303 100644
--- a/source4/smbd/process_single.c
+++ b/source4/smbd/process_single.c
@@ -111,7 +111,7 @@ NTSTATUS process_model_single_init(void)
 	ops.get_id			= single_get_id;
 
 	/* register ourselves with the PROCESS_MODEL subsystem. */
-	ret = register_backend("process_model", &ops);
+	ret = register_process_model(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register process_model 'single'!\n"));
 		return ret;
diff --git a/source4/smbd/process_standard.c b/source4/smbd/process_standard.c
index c794605dc5..3612c6a7f4 100644
--- a/source4/smbd/process_standard.c
+++ b/source4/smbd/process_standard.c
@@ -148,7 +148,7 @@ NTSTATUS process_model_standard_init(void)
 	ops.get_id = standard_get_id;
 
 	/* register ourselves with the PROCESS_MODEL subsystem. */
-	ret = register_backend("process_model", &ops);
+	ret = register_process_model(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register process_model 'standard'!\n"));
 		return ret;
diff --git a/source4/smbd/process_thread.c b/source4/smbd/process_thread.c
index 0eead7f33c..8e8ee23aaf 100644
--- a/source4/smbd/process_thread.c
+++ b/source4/smbd/process_thread.c
@@ -474,7 +474,7 @@ NTSTATUS process_model_thread_init(void)
 	ops.get_id = thread_get_id;
 
 	/* register ourselves with the PROCESS_MODEL subsystem. */
-	ret = register_backend("process_model", &ops);
+	ret = register_process_model(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register process_model 'thread'!\n"));
 		return ret;
diff --git a/source4/smbd/service.c b/source4/smbd/service.c
index fdbd5d0c80..a15bf0105c 100644
--- a/source4/smbd/service.c
+++ b/source4/smbd/service.c
@@ -313,30 +313,11 @@ const struct server_service_ops *server_service_byname(const char *name)
 	return NULL;
 }
 
-static NTSTATUS register_server_service_ops(const void *_ops)
+NTSTATUS register_server_service_ops(const void *_ops)
 {
 	return NT_STATUS_NOT_IMPLEMENTED;
 }
 
-/*
-  initialise the SERVER SERVICE subsystem
-*/
-NTSTATUS server_service_init(void)
-{
-	NTSTATUS status;
-
-	status = register_subsystem("service", register_server_service_ops); 
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	server_service_init_static_modules;
-
-	DEBUG(3,("SERVER SERVICE subsystem version %d initialised\n", SERVER_SERVICE_VERSION));
-	return NT_STATUS_OK;
-}
-
-
 /*
   close all listening sockets. This is called by process models that fork, to 
   ensure that the listen sockets from the parent are closed
-- 
cgit