From 55ef0ecea85fda48e980f5f9c6029d7bcee865df Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Mon, 31 May 2010 00:13:10 +0200
Subject: s4-python: Remove cruft to deal with static python modules, which are
 no longer supported.

---
 source4/param/provision.c          |  3 ---
 source4/scripting/python/modules.c | 40 --------------------------------------
 source4/scripting/python/modules.h |  1 -
 source4/utils/net/net.c            |  1 -
 4 files changed, 45 deletions(-)

(limited to 'source4')

diff --git a/source4/param/provision.c b/source4/param/provision.c
index 68c87239c1..28869e0a72 100644
--- a/source4/param/provision.c
+++ b/source4/param/provision.c
@@ -90,7 +90,6 @@ NTSTATUS provision_bare(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx,
 	
 	DEBUG(0,("Provision for Become-DC test using python\n"));
 
-	py_load_samba_modules();
 	Py_Initialize();
 	py_update_path("bin"); /* FIXME: Can't assume this is always the case */
 
@@ -249,7 +248,6 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context
 		return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
 	}
 
-	py_load_samba_modules();
 	Py_Initialize();
 	py_update_path("bin"); /* FIXME: Can't assume this is always the case */
 	provision_mod = provision_module();
@@ -348,7 +346,6 @@ struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_co
 	
 	DEBUG(0,("Schema for DRS tests using python\n"));
 
-	py_load_samba_modules();
 	Py_Initialize();
 	py_update_path("bin"); /* FIXME: Can't assume this is always the case */
 
diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 6cc3ca58d2..18253758b8 100644
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -22,46 +22,6 @@
 #include "scripting/python/modules.h"
 #include "dynconfig/dynconfig.h"
 
-extern void init_ldb(void);
-extern void init_security(void);
-extern void init_registry(void);
-extern void init_param(void);
-extern void init_misc(void);
-extern void init_ldb(void);
-extern void init_auth(void);
-extern void init_credentials(void);
-extern void init_tdb(void);
-extern void init_dcerpc(void);
-extern void init_events(void);
-extern void inituuid(void);
-extern void init_net(void);
-extern void initecho(void);
-extern void initdfs(void);
-extern void initdrsuapi(void);
-extern void initwinreg(void);
-extern void initepmapper(void);
-extern void initinitshutdown(void);
-extern void initmgmt(void);
-extern void initnet(void);
-extern void initatsvc(void);
-extern void initsamr(void);
-extern void initlsa(void);
-extern void initsvcctl(void);
-extern void initwkssvc(void);
-extern void initunixinfo(void);
-extern void init_libcli_nbt(void);
-extern void init_libcli_smb(void);
-
-static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
-
-void py_load_samba_modules(void)
-{
-	int i;
-	for (i = 0; i < ARRAY_SIZE(py_modules); i++) {
-		PyImport_ExtendInittab(&py_modules[i]);
-	}
-}
-
 static bool PySys_PathPrepend(PyObject *list, const char *path)
 {
 	PyObject *py_path = PyString_FromString(path);
diff --git a/source4/scripting/python/modules.h b/source4/scripting/python/modules.h
index 8e3c0a21c2..7c15fecabe 100644
--- a/source4/scripting/python/modules.h
+++ b/source4/scripting/python/modules.h
@@ -20,7 +20,6 @@
 #ifndef __SAMBA_PYTHON_MODULES_H__
 #define __SAMBA_PYTHON_MODULES_H__
 
-void py_load_samba_modules(void);
 bool py_update_path(const char *bindir);
 
 #endif /* __SAMBA_PYTHON_MODULES_H__ */ 
diff --git a/source4/utils/net/net.c b/source4/utils/net/net.c
index 5727b5308f..a534957f5b 100644
--- a/source4/utils/net/net.c
+++ b/source4/utils/net/net.c
@@ -308,7 +308,6 @@ static int binary_net(int argc, const char **argv)
 		d_printf("Failed to create an event context\n");
 		exit(1);
 	}
-	py_load_samba_modules();
 	Py_Initialize();
 	PySys_SetArgv(argc, discard_const_p(char *, argv));
 	py_update_path("bin"); /* FIXME: Can't assume this is always the case */
-- 
cgit