s4:scripting/python/pyglue.c - add a OOM handling

[metze/samba/wip.git] / source4 / scripting / python / pyglue.c

diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index b76cf685de3083242391d099d5218d6d1e01eded..cbc81d3125059c49ee35c7cf7109b86d3f07b985 100644 (file)
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -19,12 +19,9 @@
 
 #include <Python.h>
 #include "includes.h"
-#include "param/param.h"
 #include "version.h"
-#include "libcli/util/pyerrors.h"
 #include "param/pyparam.h"
 #include "lib/socket/netif.h"
-#include "lib/socket/netif_proto.h"
 
 static PyObject *py_generate_random_str(PyObject *self, PyObject *args)
 {
@@ -91,6 +88,10 @@ static PyObject *py_nttime2string(PyObject *self, PyObject *args)
                return NULL;
 
        tmp_ctx = talloc_new(NULL);
+       if (tmp_ctx == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
 
        string = nt_time_string(tmp_ctx, nt);
        ret =  PyString_FromString(string);
@@ -109,7 +110,10 @@ static PyObject *py_set_debug_level(PyObject *self, PyObject *args)
        Py_RETURN_NONE;
 }
 
-
+static PyObject *py_get_debug_level(PyObject *self)
+{
+       return PyInt_FromLong(DEBUGLEVEL);
+}
 
 /*
   return the list of interface IPs we have configured
@@ -132,15 +136,18 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args)
                return NULL;
 
        tmp_ctx = talloc_new(NULL);
+       if (tmp_ctx == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
 
-       lp_ctx = lp_from_py_object(NULL, py_lp_ctx); /* FIXME: leaky */
+       lp_ctx = lpcfg_from_py_object(tmp_ctx, py_lp_ctx);
        if (lp_ctx == NULL) {
-               PyErr_SetString(PyExc_TypeError, "Expected loadparm object");
                talloc_free(tmp_ctx);
                return NULL;
        }
 
-       load_interfaces(tmp_ctx, lp_interfaces(lp_ctx), &ifaces);
+       load_interfaces(tmp_ctx, lpcfg_interfaces(lp_ctx), &ifaces);
 
        count = iface_count(ifaces);
 
@@ -164,7 +171,6 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args)
        return pylist;
 }
 
-
 static PyMethodDef py_misc_methods[] = {
        { "generate_random_str", (PyCFunction)py_generate_random_str, METH_VARARGS,
                "generate_random_str(len) -> string\n"
@@ -180,6 +186,8 @@ static PyMethodDef py_misc_methods[] = {
                "nttime2string(nttime) -> string" },
        { "set_debug_level", (PyCFunction)py_set_debug_level, METH_VARARGS,
                "set debug level" },
+       { "get_debug_level", (PyCFunction)py_get_debug_level, METH_NOARGS,
+               "get debug level" },
        { "interface_ips", (PyCFunction)py_interface_ips, METH_VARARGS,
                "get interface IP address list"},
        { NULL }