summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2011-01-01 06:55:54 +0100
committerJelmer Vernooij <jelmer@samba.org>2011-01-03 01:48:05 +0100
commitfdb0aa2b04a5be5f13c39fd42818f898b839ef0f (patch)
tree35e619581094d7a2884023518b5d7e9adabef97c
parent027e6b2b22d4938ea0581b8c80372421a31b67ff (diff)
downloadsamba-fdb0aa2b04a5be5f13c39fd42818f898b839ef0f.tar.gz
samba-fdb0aa2b04a5be5f13c39fd42818f898b839ef0f.tar.bz2
samba-fdb0aa2b04a5be5f13c39fd42818f898b839ef0f.zip
Revert broken destructor changes.
-rw-r--r--lib/talloc/pytalloc.c2
-rw-r--r--source4/lib/ldb/pyldb.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index 94a163d3d9..614b81f057 100644
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -96,7 +96,7 @@ static void py_talloc_dealloc(PyObject* self)
py_talloc_Object *obj = (py_talloc_Object *)self;
assert(talloc_unlink(NULL, obj->talloc_ctx) != -1);
obj->talloc_ctx = NULL;
- PyObject_Del(self);
+ self->ob_type->tp_free(self);
}
/**
diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index 7ef416852d..e74cae2d20 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -1512,7 +1512,7 @@ static PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx)
static void py_ldb_dealloc(PyLdbObject *self)
{
talloc_free(self->mem_ctx);
- PyObject_Del(self);
+ self->ob_type->tp_free(self);
}
static PyTypeObject PyLdb = {