diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-09-22 15:35:36 -0700 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-09-22 17:48:23 -0700 |
| commit | 3fea9df85a7d489b81e21a7a63f9e115de712d4c (patch) | |
| tree | 07c31f8431ccc4e563922f1b7f56794e449e52c9 /source4/scripting/python | |
| parent | 63031a2a78cff19f1f17137adfbc85a4df05ae36 (diff) | |
| download | samba-3fea9df85a7d489b81e21a7a63f9e115de712d4c.tar.gz samba-3fea9df85a7d489b81e21a7a63f9e115de712d4c.tar.bz2 samba-3fea9df85a7d489b81e21a7a63f9e115de712d4c.zip | |
s4-param: Check type when converting python object to lp_ctx, fix some
memory leaks.
Diffstat (limited to 'source4/scripting/python')
| -rw-r--r-- | source4/scripting/python/pyglue.c | 3 | ||||
| -rw-r--r-- | source4/scripting/python/samba/tests/gensec.py | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index 1f968e16f9..2afd1fa010 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -132,9 +132,8 @@ static PyObject *py_interface_ips(PyObject *self, PyObject *args) tmp_ctx = talloc_new(NULL); - lp_ctx = lpcfg_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; } diff --git a/source4/scripting/python/samba/tests/gensec.py b/source4/scripting/python/samba/tests/gensec.py index 05b9a5946f..3e71610591 100644 --- a/source4/scripting/python/samba/tests/gensec.py +++ b/source4/scripting/python/samba/tests/gensec.py @@ -38,9 +38,8 @@ class CredentialsTests(samba.tests.TestCase): def test_start_mech_by_unknown_name(self): self.assertRaises(RuntimeError, self.gensec.start_mech_by_name, "foo") + def test_start_mech_by_name(self): + self.gensec.start_mech_by_name("spnego") + def test_info_uninitialized(self): self.assertRaises(RuntimeError, self.gensec.session_info) - - def test_info(self): - self.gensec.start_mech_by_name("spnego") - self.assertEquals(None, self.gensec.session_info()) |