sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

s4-python: Remove cruft to deal with static python modules, which are no

Browse Source 
longer supported.
This commit is contained in:
Jelmer Vernooij 2010-05-31 00:13:10 +02:00
parent 390b0521bd
commit 55ef0ecea8
4 changed files with 0 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source4/param/provision.c
View File

@ -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")); DEBUG(0,("Provision for Become-DC test using python\n"));
py_load_samba_modules();
Py_Initialize(); Py_Initialize();
py_update_path("bin"); /* FIXME: Can't assume this is always the case */ 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; return NT_STATUS_CANT_ACCESS_DOMAIN_INFO;
} }
py_load_samba_modules();
Py_Initialize(); Py_Initialize();
py_update_path("bin"); /* FIXME: Can't assume this is always the case */ py_update_path("bin"); /* FIXME: Can't assume this is always the case */
provision_mod = provision_module(); 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")); DEBUG(0,("Schema for DRS tests using python\n"));
py_load_samba_modules();
Py_Initialize(); Py_Initialize();
py_update_path("bin"); /* FIXME: Can't assume this is always the case */ py_update_path("bin"); /* FIXME: Can't assume this is always the case */

40
source4/scripting/python/modules.c
View File

@ -22,46 +22,6 @@
#include "scripting/python/modules.h" #include "scripting/python/modules.h"
#include "dynconfig/dynconfig.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) static bool PySys_PathPrepend(PyObject *list, const char *path)
{ {
PyObject *py_path = PyString_FromString(path); PyObject *py_path = PyString_FromString(path);

1
source4/scripting/python/modules.h
View File

@ -20,7 +20,6 @@
#ifndef __SAMBA_PYTHON_MODULES_H__ #ifndef __SAMBA_PYTHON_MODULES_H__
#define __SAMBA_PYTHON_MODULES_H__ #define __SAMBA_PYTHON_MODULES_H__
void py_load_samba_modules(void);
bool py_update_path(const char *bindir); bool py_update_path(const char *bindir);
#endif /* __SAMBA_PYTHON_MODULES_H__ */ #endif /* __SAMBA_PYTHON_MODULES_H__ */

1
source4/utils/net/net.c
View File

@ -308,7 +308,6 @@ static int binary_net(int argc, const char **argv)
d_printf("Failed to create an event context\n"); d_printf("Failed to create an event context\n");
exit(1); exit(1);
} }
py_load_samba_modules();
Py_Initialize(); Py_Initialize();
PySys_SetArgv(argc, discard_const_p(char *, argv)); PySys_SetArgv(argc, discard_const_p(char *, argv));
py_update_path("bin"); /* FIXME: Can't assume this is always the case */ py_update_path("bin"); /* FIXME: Can't assume this is always the case */