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/auth/auth.c         | 20 +-------------------
 source4/auth/auth_builtin.c |  6 +++---
 source4/auth/auth_sam.c     |  4 ++--
 source4/auth/auth_winbind.c |  2 +-
 source4/auth/config.mk      |  1 -
 5 files changed, 7 insertions(+), 26 deletions(-)

(limited to 'source4/auth')

diff --git a/source4/auth/auth.c b/source4/auth/auth.c
index 58075b4c75..cd59190a42 100644
--- a/source4/auth/auth.c
+++ b/source4/auth/auth.c
@@ -411,7 +411,7 @@ static int num_backends;
   The 'name' can be later used by other backends to find the operations
   structure for this backend.
 */
-static NTSTATUS auth_register(const void *_ops)
+NTSTATUS auth_register(const void *_ops)
 {
 	const struct auth_operations *ops = _ops;
 	struct auth_operations *new_ops;
@@ -477,24 +477,6 @@ const struct auth_critical_sizes *auth_interface_version(void)
 	return &critical_sizes;
 }
 
-/*
-  initialise the AUTH subsystem
-*/
-NTSTATUS auth_init(void)
-{
-	NTSTATUS status;
-	
-	status = register_subsystem("auth", auth_register); 
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	auth_init_static_modules;
-	
-	DEBUG(3,("AUTH subsystem version %d initialised\n", AUTH_INTERFACE_VERSION));
-	return status;
-}
-
 NTSTATUS server_service_auth_init(void)
 {
 	return NT_STATUS_OK;	
diff --git a/source4/auth/auth_builtin.c b/source4/auth/auth_builtin.c
index c67b9b6835..56c465cfae 100644
--- a/source4/auth/auth_builtin.c
+++ b/source4/auth/auth_builtin.c
@@ -177,7 +177,7 @@ NTSTATUS auth_builtin_init(void)
 
 	ops.name = "guest";
 	ops.init = auth_init_guest;
-	ret = register_backend("auth", &ops);
+	ret = auth_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' auth backend!\n",
 			ops.name));
@@ -187,7 +187,7 @@ NTSTATUS auth_builtin_init(void)
 #ifdef DEVELOPER
 	ops.name = "name_to_ntstatus";
 	ops.init = auth_init_name_to_ntstatus;
-	ret = register_backend("auth", &ops);
+	ret = auth_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' auth backend!\n",
 			ops.name));
@@ -196,7 +196,7 @@ NTSTATUS auth_builtin_init(void)
 
 	ops.name = "fixed_challenge";
 	ops.init = auth_init_fixed_challenge;
-	ret = register_backend("auth", &ops);
+	ret = auth_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' auth backend!\n",
 			ops.name));
diff --git a/source4/auth/auth_sam.c b/source4/auth/auth_sam.c
index 636935e0b9..7cba6e83b3 100644
--- a/source4/auth/auth_sam.c
+++ b/source4/auth/auth_sam.c
@@ -631,7 +631,7 @@ NTSTATUS auth_sam_init(void)
 
 	ops.name = "sam";
 	ops.init = auth_init_sam;
-	ret = register_backend("auth", &ops);
+	ret = auth_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' auth backend!\n",
 			ops.name));
@@ -640,7 +640,7 @@ NTSTATUS auth_sam_init(void)
 
 	ops.name = "sam_ignoredomain";
 	ops.init = auth_init_sam_ignoredomain;
-	ret = register_backend("auth", &ops);
+	ret = auth_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' auth backend!\n",
 			ops.name));
diff --git a/source4/auth/auth_winbind.c b/source4/auth/auth_winbind.c
index 2d8cdb72c9..6607295033 100644
--- a/source4/auth/auth_winbind.c
+++ b/source4/auth/auth_winbind.c
@@ -151,7 +151,7 @@ NTSTATUS auth_winbind_init(void)
 
 	ops.name = "winbind";
 	ops.init = auth_init_winbind;
-	ret = register_backend("auth", &ops);
+	ret = auth_register(&ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' auth backend!\n",
 			ops.name));
diff --git a/source4/auth/config.mk b/source4/auth/config.mk
index 65c24ca897..cf794e30a9 100644
--- a/source4/auth/config.mk
+++ b/source4/auth/config.mk
@@ -37,7 +37,6 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM AUTH
 [SUBSYSTEM::AUTH]
-INIT_FUNCTION = auth_init
 INIT_OBJ_FILES = \
 		auth/auth.o
 ADD_OBJ_FILES = \
-- 
cgit