samba3-python: Add methods to get any entry (user/group) and its sid from idmap

[idra/samba.git] / source4 / scripting / python / modules.c

diff --git a/source4/scripting/python/modules.c b/source4/scripting/python/modules.c
index 2a888706602ef4d8ed4b19ab3ec65fc841aeafac..78cdbc0d87966dfe9fb5d0d2d4f574b4c2745a4e 100644 (file)
--- a/source4/scripting/python/modules.c
+++ b/source4/scripting/python/modules.c
@@ -17,37 +17,47 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-#include "includes.h"
 #include <Python.h>
-#include "build.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);
-
-static struct _inittab py_modules[] = { STATIC_LIBPYTHON_MODULES };
-
-void py_load_samba_modules(void)
+#include "includes.h"
+#include "scripting/python/modules.h"
+#include "dynconfig/dynconfig.h"
+
+static bool PySys_PathPrepend(PyObject *list, const char *path)
 {
-       int i;
-       for (i = 0; i < ARRAY_SIZE(py_modules); i++) {
-               PyImport_ExtendInittab(&py_modules[i]);
-       }
+       PyObject *py_path = PyString_FromString(path);
+       if (py_path == NULL)
+               return false;
+
+       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:%s/python:%s/../scripting/python", Py_GetPath(), bindir, bindir);
-       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;
 }