Changeset 745 for trunk/server/source4/scripting/python/modules.c

Timestamp:

Nov 27, 2012, 4:43:17 PM (13 years ago)

Author:

Silvan Scherrer

Message:

Samba Server: updated trunk to 3.6.0

Location:

trunk/server

Files:

• . (modified) (1 prop)
• source4/scripting/python/modules.c (modified) (1 diff)

trunk/server/source4/scripting/python/modules.c

@@ -18 +18 @@
 */
 
+#include <Python.h>
 #include "includes.h"
 #include "scripting/python/modules.h"
-#include <Python.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 bool PySys_PathPrepend(PyObject *list, const char *path)
+{
+        PyObject *py_path = PyString_FromString(path);
+        if (py_path == NULL)
+                return false;
 
-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]);
-        }
+        return (PyList_Insert(list, 0, py_path) == 0);
 }
 
-void py_update_path(const char *bindir)
+bool py_update_path(void)
 {
-        char *newpath;
-        asprintf(&newpath, "%s/python:%s/../scripting/python:%s", bindir, bindir, Py_GetPath());
-        PySys_SetPath(newpath);
-        free(newpath);
+        PyObject *mod_sys, *py_path;
+
+        mod_sys = PyImport_ImportModule("sys");
+        if (mod_sys == NULL) {
+                return false;
+        }
+
+        py_path = PyObject_GetAttrString(mod_sys, "path");
+        if (py_path == NULL) {
+                return false;
+        }       
+
+        if (!PyList_Check(py_path)) {
+                return false;
+        }
+
+        if (!PySys_PathPrepend(py_path, dyn_PYTHONDIR)) {
+                return false;
+        }
+
+        if (strcmp(dyn_PYTHONARCHDIR, dyn_PYTHONDIR) != 0) {
+                if (!PySys_PathPrepend(py_path, dyn_PYTHONARCHDIR)) {
+                        return false;
+                }
+        }
+
+        return true;
 }