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/rpc_server/config.mk              |  1 -
 source4/rpc_server/dcerpc_server.c        | 20 +-------------------
 source4/rpc_server/dcom/remact.c          | 13 -------------
 source4/rpc_server/remote/dcesrv_remote.c |  2 +-
 4 files changed, 2 insertions(+), 34 deletions(-)

(limited to 'source4/rpc_server')

diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 4326120e57..401d8c62fb 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -190,7 +190,6 @@ REQUIRED_SUBSYSTEMS = \
 ################################################
 # Start SUBSYSTEM DCERPC
 [SUBSYSTEM::DCERPC]
-INIT_FUNCTION = dcerpc_server_init
 INIT_OBJ_FILES = \
 		rpc_server/dcerpc_server.o
 ADD_OBJ_FILES = \
diff --git a/source4/rpc_server/dcerpc_server.c b/source4/rpc_server/dcerpc_server.c
index 83c0872ba7..67baa6281c 100644
--- a/source4/rpc_server/dcerpc_server.c
+++ b/source4/rpc_server/dcerpc_server.c
@@ -1100,7 +1100,7 @@ static int num_ep_servers;
 
   The 'type' is used to specify whether this is for a disk, printer or IPC$ share
 */
-static NTSTATUS dcerpc_register_ep_server(const void *_ep_server)
+NTSTATUS dcerpc_register_ep_server(const void *_ep_server)
 {
 	const struct dcesrv_endpoint_server *ep_server = _ep_server;
 	
@@ -1166,24 +1166,6 @@ const struct dcesrv_critical_sizes *dcerpc_module_version(void)
 	return &critical_sizes;
 }
 
-/*
-  initialise the DCERPC subsystem
-*/
-NTSTATUS dcerpc_server_init(void)
-{
-	NTSTATUS status;
-
-	status = register_subsystem("dcerpc", dcerpc_register_ep_server); 
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	dcerpc_init_static_modules;
-
-	DEBUG(3,("DCERPC subsystem version %d initialised\n", DCERPC_MODULE_VERSION));
-	return NT_STATUS_OK;
-}
-
 static const struct server_service_ops dcesrv_ops = {
 	.name			= "rpc",
 	.service_init		= dcesrv_init,
diff --git a/source4/rpc_server/dcom/remact.c b/source4/rpc_server/dcom/remact.c
index ce7c9c0c23..e133cb745d 100644
--- a/source4/rpc_server/dcom/remact.c
+++ b/source4/rpc_server/dcom/remact.c
@@ -75,14 +75,6 @@ static WERROR RemoteActivation(struct dcesrv_call_state *dce_call, TALLOC_CTX *m
 }
 
 
-static NTSTATUS register_dcom_class(const void *_c)
-{
-	const struct dcom_class *class = _c;
-	/* FIXME */
-
-	return NT_STATUS_NOT_SUPPORTED;
-}
-
 NTSTATUS dcerpc_server_dcom_init(void)
 {
 	NTSTATUS status;
@@ -96,11 +88,6 @@ NTSTATUS dcerpc_server_dcom_init(void)
 		return status;
 	}
 
-	status = register_subsystem("dcom", register_dcom_class);
-	if (NT_STATUS_IS_ERR(status)) {
-		return status;
-	}
-
 	return NT_STATUS_OK;
 }
 
diff --git a/source4/rpc_server/remote/dcesrv_remote.c b/source4/rpc_server/remote/dcesrv_remote.c
index fbd6f65a1a..957f5aa1b2 100644
--- a/source4/rpc_server/remote/dcesrv_remote.c
+++ b/source4/rpc_server/remote/dcesrv_remote.c
@@ -200,7 +200,7 @@ NTSTATUS dcerpc_server_remote_init(void)
 	ep_server.interface_by_name = remote_op_interface_by_name;
 
 	/* register ourselves with the DCERPC subsystem. */
-	ret = register_backend("dcerpc", &ep_server);
+	ret = dcerpc_register_ep_server(&ep_server);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register 'remote' endpoint server!\n"));
 		return ret;
-- 
cgit