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)

9 files changed, 11 insertions, 31 deletions

diff --git a/source4/ntvfs/cifs/vfs_cifs.c b/source4/ntvfs/cifs/vfs_cifs.c
index ea169b7ee6..bfba31b46f 100644
--- a/source4/ntvfs/cifs/vfs_cifs.c
+++ b/source4/ntvfs/cifs/vfs_cifs.c
@@ -872,7 +872,7 @@ NTSTATUS ntvfs_cifs_init(void)
 
 	/* register ourselves with the NTVFS subsystem. We register
 	   under the name 'cifs'. */
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register CIFS backend!\n"));
diff --git a/source4/ntvfs/config.mk b/source4/ntvfs/config.mk
index 14215004ea..43157a8c66 100644
--- a/source4/ntvfs/config.mk
+++ b/source4/ntvfs/config.mk
@@ -61,7 +61,6 @@ INIT_OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM NTVFS
 [SUBSYSTEM::NTVFS]
-INIT_FUNCTION = ntvfs_init
 INIT_OBJ_FILES = \
 		ntvfs/ntvfs_base.o
 ADD_OBJ_FILES = \
diff --git a/source4/ntvfs/ipc/vfs_ipc.c b/source4/ntvfs/ipc/vfs_ipc.c
index 271be09ac3..a53accd533 100644
--- a/source4/ntvfs/ipc/vfs_ipc.c
+++ b/source4/ntvfs/ipc/vfs_ipc.c
@@ -756,7 +756,7 @@ NTSTATUS ntvfs_ipc_init(void)
 	ops.cancel = ipc_cancel;
 
 	/* register ourselves with the NTVFS subsystem. */
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register IPC backend!\n"));
diff --git a/source4/ntvfs/nbench/vfs_nbench.c b/source4/ntvfs/nbench/vfs_nbench.c
index 1bcfda1371..560f4a646b 100644
--- a/source4/ntvfs/nbench/vfs_nbench.c
+++ b/source4/ntvfs/nbench/vfs_nbench.c
@@ -924,7 +924,7 @@ NTSTATUS ntvfs_nbench_init(void)
 	ops.trans2 = NULL;
 
 	/* register ourselves with the NTVFS subsystem. */
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register nbench backend!\n"));
diff --git a/source4/ntvfs/ntvfs_base.c b/source4/ntvfs/ntvfs_base.c
index c168467eae..136ef14e4c 100644
--- a/source4/ntvfs/ntvfs_base.c
+++ b/source4/ntvfs/ntvfs_base.c
@@ -45,7 +45,7 @@ static int num_backends;
 
   The 'type' is used to specify whether this is for a disk, printer or IPC$ share
 */
-static NTSTATUS ntvfs_register(const void *_ops)
+NTSTATUS ntvfs_register(const void *_ops)
 {
 	const struct ntvfs_ops *ops = _ops;
 	struct ntvfs_ops *new_ops;
@@ -117,25 +117,6 @@ const struct ntvfs_critical_sizes *ntvfs_interface_version(void)
 
 
 /*
-  initialise the NTVFS subsystem
-*/
-NTSTATUS ntvfs_init(void)
-{
-	NTSTATUS status;
-
-	status = register_subsystem("ntvfs", ntvfs_register); 
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	ntvfs_init_static_modules;
-
-	DEBUG(3,("NTVFS subsystem version %d initialised\n", NTVFS_INTERFACE_VERSION));
-	return status;
-}
-
-
-/*
   initialise a connection structure to point at a NTVFS backend
 */
 NTSTATUS ntvfs_init_connection(struct smbsrv_request *req, enum ntvfs_type type)
diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 39f6717cae..e5712e3e7d 100644
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -252,10 +252,10 @@ NTSTATUS ntvfs_posix_init(void)
 	   under the name 'default' as we wish to be the default
 	   backend, and also register as 'posix' */
 	ops.name = "default";
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 
 	ops.name = "posix";
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register POSIX backend!\n"));
diff --git a/source4/ntvfs/print/vfs_print.c b/source4/ntvfs/print/vfs_print.c
index 372f64e982..4e2dfad0ca 100644
--- a/source4/ntvfs/print/vfs_print.c
+++ b/source4/ntvfs/print/vfs_print.c
@@ -107,7 +107,7 @@ NTSTATUS ntvfs_print_init(void)
 
 	/* register ourselves with the NTVFS subsystem. We register under the name 'default'
 	   as we wish to be the default backend */
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register PRINT backend!\n"));
diff --git a/source4/ntvfs/simple/vfs_simple.c b/source4/ntvfs/simple/vfs_simple.c
index 807f51a43d..57d626465a 100644
--- a/source4/ntvfs/simple/vfs_simple.c
+++ b/source4/ntvfs/simple/vfs_simple.c
@@ -1006,7 +1006,7 @@ NTSTATUS ntvfs_simple_init(void)
 
 	ops.type = NTVFS_DISK;
 	ops.name = "simple";
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register simple backend with name: %s!\n",
diff --git a/source4/ntvfs/unixuid/vfs_unixuid.c b/source4/ntvfs/unixuid/vfs_unixuid.c
index 7f8f8acf99..4520df59fc 100644
--- a/source4/ntvfs/unixuid/vfs_unixuid.c
+++ b/source4/ntvfs/unixuid/vfs_unixuid.c
@@ -803,15 +803,15 @@ NTSTATUS ntvfs_unixuid_init(void)
 
 	/* we register under all 3 backend types, as we are not type specific */
 	ops.type = NTVFS_DISK;	
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) goto failed;
 
 	ops.type = NTVFS_PRINT;	
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) goto failed;
 
 	ops.type = NTVFS_IPC;	
-	ret = register_backend("ntvfs", &ops);
+	ret = ntvfs_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) goto failed;
 	
 failed: