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)

3 files changed, 3 insertions, 12 deletions

diff --git a/source4/libcli/auth/gensec.c b/source4/libcli/auth/gensec.c
index 88b1081b11..360a69c0e0 100644
--- a/source4/libcli/auth/gensec.c
+++ b/source4/libcli/auth/gensec.c
@@ -751,7 +751,7 @@ NTSTATUS gensec_get_password(struct gensec_security *gensec_security,
   The 'name' can be later used by other backends to find the operations
   structure for this backend.
 */
-static NTSTATUS gensec_register(const void *_ops)
+NTSTATUS gensec_register(const void *_ops)
 {
 	const struct gensec_security_ops *ops = _ops;
 	
@@ -803,15 +803,6 @@ const struct gensec_critical_sizes *gensec_interface_version(void)
 */
 NTSTATUS gensec_init(void)
 {
-	NTSTATUS status = register_subsystem("gensec", gensec_register); 
-	if (!NT_STATUS_IS_OK(status)) {
-		return status;
-	}
-
-	gensec_init_static_modules;
-
 	gensec_dcerpc_schannel_init();
-
-	DEBUG(3,("GENSEC subsystem version %d initialised\n", GENSEC_INTERFACE_VERSION));
 	return NT_STATUS_OK;
 }
diff --git a/source4/libcli/auth/gensec_ntlmssp.c b/source4/libcli/auth/gensec_ntlmssp.c
index e774efe94e..ee8d1aa79c 100644
--- a/source4/libcli/auth/gensec_ntlmssp.c
+++ b/source4/libcli/auth/gensec_ntlmssp.c
@@ -419,7 +419,7 @@ static const struct gensec_security_ops gensec_ntlmssp_security_ops = {
 NTSTATUS gensec_ntlmssp_init(void)
 {
 	NTSTATUS ret;
-	ret = register_backend("gensec", &gensec_ntlmssp_security_ops);
+	ret = gensec_register(&gensec_ntlmssp_security_ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' gensec backend!\n",
 			gensec_ntlmssp_security_ops.name));
diff --git a/source4/libcli/auth/spnego.c b/source4/libcli/auth/spnego.c
index ab3aff32bb..bafbf64294 100644
--- a/source4/libcli/auth/spnego.c
+++ b/source4/libcli/auth/spnego.c
@@ -714,7 +714,7 @@ static const struct gensec_security_ops gensec_spnego_security_ops = {
 NTSTATUS gensec_spnego_init(void)
 {
 	NTSTATUS ret;
-	ret = register_backend("gensec", &gensec_spnego_security_ops);
+	ret = gensec_register(&gensec_spnego_security_ops);
 	if (!NT_STATUS_IS_OK(ret)) {
 		DEBUG(0,("Failed to register '%s' gensec backend!\n",
 			gensec_spnego_security_ops.name));