s4-ldb: Add ldb_msg_canonicalize_ex() to accept a memory context from client
[kamenim/samba.git] / source4 / lib / ldb / pyldb.c
index 0dac61b8b70c17d76e6a57995a4b5710e6e8cc62..925ea5232aaf833be2475266ac2eabe851d73e5e 100644 (file)
@@ -5,8 +5,8 @@
 
    Copyright (C) 2005,2006 Tim Potter <tpot@samba.org>
    Copyright (C) 2006 Simo Sorce <idra@samba.org>
-   Copyright (C) 2007-2009 Jelmer Vernooij <jelmer@samba.org>
-   Copyright (C) 2009 Matthias Dieter Wallnöfer
+   Copyright (C) 2007-2010 Jelmer Vernooij <jelmer@samba.org>
+   Copyright (C) 2009-2010 Matthias Dieter Wallnöfer
 
         ** NOTE! The following LGPL license applies to the ldb
         ** library. This does NOT imply that all of Samba is released
@@ -26,9 +26,9 @@
    License along with this library; if not, see <http://www.gnu.org/licenses/>.
 */
 
+#include <Python.h>
 #include "replace.h"
 #include "ldb_private.h"
-#include <Python.h>
 #include "pyldb.h"
 
 /* There's no Py_ssize_t in 2.4, apparently */
@@ -61,6 +61,8 @@ PyAPI_DATA(PyTypeObject) PyLdb;
 PyAPI_DATA(PyTypeObject) PyLdbMessageElement;
 PyAPI_DATA(PyTypeObject) PyLdbTree;
 
+static PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx);
+
 static PyObject *PyObject_FromLdbValue(struct ldb_context *ldb_ctx, 
                                                           struct ldb_message_element *el, 
                                                           struct ldb_val *val)
@@ -78,34 +80,6 @@ static PyObject *PyObject_FromLdbValue(struct ldb_context *ldb_ctx,
        return ret;
 }
 
-/**
- * Obtain a ldb DN from a Python object.
- *
- * @param mem_ctx Memory context
- * @param object Python object
- * @param ldb_ctx LDB context
- * @return Whether or not the conversion succeeded
- */
-bool PyObject_AsDn(TALLOC_CTX *mem_ctx, PyObject *object, 
-                  struct ldb_context *ldb_ctx, struct ldb_dn **dn)
-{
-       struct ldb_dn *odn;
-
-       if (ldb_ctx != NULL && PyString_Check(object)) {
-               odn = ldb_dn_new(mem_ctx, ldb_ctx, PyString_AsString(object));
-               *dn = odn;
-               return true;
-       }
-
-       if (PyLdbDn_Check(object)) {
-               *dn = PyLdbDn_AsDn(object);
-               return true;
-       }
-
-       PyErr_SetString(PyExc_TypeError, "Expected DN");
-       return false;
-}
-
 /**
  * Create a Python object from a ldb_result.
  *
@@ -408,7 +382,7 @@ static void py_ldb_dn_dealloc(PyLdbDnObject *self)
 }
 
 PyTypeObject PyLdbDn = {
-       .tp_name = "Dn",
+       .tp_name = "ldb.Dn",
        .tp_methods = py_ldb_dn_methods,
        .tp_str = (reprfunc)py_ldb_dn_get_linearized,
        .tp_repr = (reprfunc)py_ldb_dn_repr,
@@ -477,6 +451,12 @@ static PyObject *py_ldb_transaction_commit(PyLdbObject *self)
        Py_RETURN_NONE;
 }
 
+static PyObject *py_ldb_transaction_prepare_commit(PyLdbObject *self)
+{
+       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ldb_transaction_prepare_commit(PyLdb_AsLdbContext(self)), PyLdb_AsLdbContext(self));
+       Py_RETURN_NONE;
+}
+
 static PyObject *py_ldb_transaction_cancel(PyLdbObject *self)
 {
        PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ldb_transaction_cancel(PyLdb_AsLdbContext(self)), PyLdb_AsLdbContext(self));
@@ -641,21 +621,85 @@ static PyObject *py_ldb_connect(PyLdbObject *self, PyObject *args, PyObject *kwa
 static PyObject *py_ldb_modify(PyLdbObject *self, PyObject *args)
 {
        PyObject *py_msg;
+       PyObject *py_controls = Py_None;
+       struct ldb_context *ldb_ctx;
+       struct ldb_request *req;
+       struct ldb_control **parsed_controls;
+       struct ldb_message *msg;
        int ret;
-       if (!PyArg_ParseTuple(args, "O", &py_msg))
+       TALLOC_CTX *mem_ctx;
+
+       if (!PyArg_ParseTuple(args, "O|O", &py_msg, &py_controls))
+               return NULL;
+
+       mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               PyErr_NoMemory();
                return NULL;
+       }
+       ldb_ctx = PyLdb_AsLdbContext(self);
+
+       if (py_controls == Py_None) {
+               parsed_controls = NULL;
+       } else {
+               const char **controls = PyList_AsStringList(mem_ctx, py_controls, "controls");
+               parsed_controls = ldb_parse_control_strings(ldb_ctx, mem_ctx, controls);
+               talloc_free(controls);
+       }
 
        if (!PyLdbMessage_Check(py_msg)) {
                PyErr_SetString(PyExc_TypeError, "Expected Ldb Message");
+               talloc_free(mem_ctx);
                return NULL;
        }
+       msg = PyLdbMessage_AsMessage(py_msg);
 
-       ret = ldb_modify(PyLdb_AsLdbContext(self), PyLdbMessage_AsMessage(py_msg));
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, PyLdb_AsLdbContext(self));
+       ret = ldb_msg_sanity_check(ldb_ctx, msg);
+       if (ret != LDB_SUCCESS) {
+               PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
+               talloc_free(mem_ctx);
+               return NULL;
+       }
+
+       ret = ldb_build_mod_req(&req, ldb_ctx, mem_ctx, msg, parsed_controls,
+                               NULL, ldb_op_default_callback, NULL);
+        if (ret != LDB_SUCCESS) {
+               PyErr_SetString(PyExc_TypeError, "failed to build request");
+               talloc_free(mem_ctx);
+               return NULL;
+       }
+
+        /* do request and autostart a transaction */
+       /* Then let's LDB handle the message error in case of pb as they are meaningful */
+
+       ret = ldb_transaction_start(ldb_ctx);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(mem_ctx);
+               PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
+        }
+
+        ret = ldb_request(ldb_ctx, req);
+        if (ret == LDB_SUCCESS) {
+                ret = ldb_wait(req->handle, LDB_WAIT_ALL);
+        }
+
+       if (ret == LDB_SUCCESS) {
+                ret = ldb_transaction_commit(ldb_ctx);
+        } else {
+               ldb_transaction_cancel(ldb_ctx);
+               if (ldb_ctx->err_string == NULL) {
+                       /* no error string was setup by the backend */
+                       ldb_asprintf_errstring(ldb_ctx, "%s (%d)", ldb_strerror(ret), ret);
+               }
+       }
+
+       talloc_free(mem_ctx);
+       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
 
        Py_RETURN_NONE;
 }
 
+
 static PyObject *py_ldb_add(PyLdbObject *self, PyObject *args)
 {
        PyObject *py_msg;
@@ -672,14 +716,19 @@ static PyObject *py_ldb_add(PyLdbObject *self, PyObject *args)
 
        if (!PyArg_ParseTuple(args, "O|O", &py_msg, &py_controls ))
                return NULL;
-       ldb_ctx = PyLdb_AsLdbContext(self);
 
        mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
+       ldb_ctx = PyLdb_AsLdbContext(self);
+
        if (py_controls == Py_None) {
                parsed_controls = NULL;
        } else {
-               const char **controls = PyList_AsStringList(ldb_ctx, py_controls, "controls");
-               parsed_controls = ldb_parse_control_strings(ldb_ctx, ldb_ctx, controls);
+               const char **controls = PyList_AsStringList(mem_ctx, py_controls, "controls");
+               parsed_controls = ldb_parse_control_strings(ldb_ctx, mem_ctx, controls);
                talloc_free(controls);
        }
        if (PyDict_Check(py_msg)) {
@@ -727,18 +776,13 @@ static PyObject *py_ldb_add(PyLdbObject *self, PyObject *args)
         
        ret = ldb_msg_sanity_check(ldb_ctx, msg);
         if (ret != LDB_SUCCESS) {
-               PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, PyLdb_AsLdbContext(self));
+               PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
                talloc_free(mem_ctx);
                return NULL;
         }
 
-        ret = ldb_build_add_req(&req, ldb_ctx, ldb_ctx,
-                                        msg,
-                                        parsed_controls,
-                                        NULL,
-                                        ldb_op_default_callback,
-                                        NULL);
-
+        ret = ldb_build_add_req(&req, ldb_ctx, mem_ctx, msg, parsed_controls,
+                               NULL, ldb_op_default_callback, NULL);
         if (ret != LDB_SUCCESS) {
                PyErr_SetString(PyExc_TypeError, "failed to build request");
                talloc_free(mem_ctx);
@@ -750,9 +794,8 @@ static PyObject *py_ldb_add(PyLdbObject *self, PyObject *args)
 
         ret = ldb_transaction_start(ldb_ctx);
         if (ret != LDB_SUCCESS) {
-               talloc_free(req);
                talloc_free(mem_ctx);
-               PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, PyLdb_AsLdbContext(self));
+               PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
         }
 
         ret = ldb_request(ldb_ctx, req);
@@ -769,9 +812,9 @@ static PyObject *py_ldb_add(PyLdbObject *self, PyObject *args)
                        ldb_asprintf_errstring(ldb_ctx, "%s (%d)", ldb_strerror(ret), ret);
                }
        }
-       talloc_free(req);
+
        talloc_free(mem_ctx);
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, PyLdb_AsLdbContext(self));
+       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
 
        Py_RETURN_NONE;
 }
@@ -781,17 +824,69 @@ static PyObject *py_ldb_delete(PyLdbObject *self, PyObject *args)
        PyObject *py_dn;
        struct ldb_dn *dn;
        int ret;
-       struct ldb_context *ldb;
-       if (!PyArg_ParseTuple(args, "O", &py_dn))
+       struct ldb_context *ldb_ctx;
+       struct ldb_request *req;
+       PyObject *py_controls = Py_None;
+       TALLOC_CTX *mem_ctx;
+       struct ldb_control **parsed_controls;
+
+       if (!PyArg_ParseTuple(args, "O|O", &py_dn, &py_controls))
                return NULL;
 
-       ldb = PyLdb_AsLdbContext(self);
+       mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
+       ldb_ctx = PyLdb_AsLdbContext(self);
+
+       if (py_controls == Py_None) {
+               parsed_controls = NULL;
+       } else {
+               const char **controls = PyList_AsStringList(mem_ctx, py_controls, "controls");
+               parsed_controls = ldb_parse_control_strings(ldb_ctx, mem_ctx, controls);
+               talloc_free(controls);
+       }
 
-       if (!PyObject_AsDn(NULL, py_dn, ldb, &dn))
+       if (!PyObject_AsDn(mem_ctx, py_dn, ldb_ctx, &dn)) {
+               talloc_free(mem_ctx);
                return NULL;
+       }
 
-       ret = ldb_delete(ldb, dn);
-       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb);
+       ret = ldb_build_del_req(&req, ldb_ctx, mem_ctx, dn, parsed_controls,
+                               NULL, ldb_op_default_callback, NULL);
+       if (ret != LDB_SUCCESS) {
+               PyErr_SetString(PyExc_TypeError, "failed to build request");
+               talloc_free(mem_ctx);
+               return NULL;
+       }
+
+       /* do request and autostart a transaction */
+       /* Then let's LDB handle the message error in case of pb as they are meaningful */
+
+       ret = ldb_transaction_start(ldb_ctx);
+       if (ret != LDB_SUCCESS) {
+               talloc_free(mem_ctx);
+               PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
+       }
+
+       ret = ldb_request(ldb_ctx, req);
+       if (ret == LDB_SUCCESS) {
+               ret = ldb_wait(req->handle, LDB_WAIT_ALL);
+       }
+
+       if (ret == LDB_SUCCESS) {
+               ret = ldb_transaction_commit(ldb_ctx);
+       } else {
+               ldb_transaction_cancel(ldb_ctx);
+               if (ldb_ctx->err_string == NULL) {
+                       /* no error string was setup by the backend */
+                       ldb_asprintf_errstring(ldb_ctx, "%s (%d)", ldb_strerror(ret), ret);
+               }
+       }
+
+       talloc_free(mem_ctx);
+       PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
 
        Py_RETURN_NONE;
 }
@@ -803,6 +898,7 @@ static PyObject *py_ldb_rename(PyLdbObject *self, PyObject *args)
        int ret;
        struct ldb_context *ldb;
        TALLOC_CTX *mem_ctx;
+
        if (!PyArg_ParseTuple(args, "OO", &py_dn1, &py_dn2))
                return NULL;
 
@@ -811,7 +907,9 @@ static PyObject *py_ldb_rename(PyLdbObject *self, PyObject *args)
                PyErr_NoMemory();
                return NULL;
        }
+
        ldb = PyLdb_AsLdbContext(self);
+
        if (!PyObject_AsDn(mem_ctx, py_dn1, ldb, &dn1)) {
                talloc_free(mem_ctx);
                return NULL;
@@ -937,9 +1035,11 @@ static PyObject *py_ldb_parse_ldif(PyLdbObject *self, PyObject *args)
 
 static PyObject *py_ldb_msg_diff(PyLdbObject *self, PyObject *args)
 {
+       int ldb_ret;
        PyObject *py_msg_old;
        PyObject *py_msg_new;
        struct ldb_message *diff;
+       struct ldb_context *ldb;
        PyObject *py_ret;
 
        if (!PyArg_ParseTuple(args, "OO", &py_msg_old, &py_msg_new))
@@ -955,14 +1055,20 @@ static PyObject *py_ldb_msg_diff(PyLdbObject *self, PyObject *args)
                return NULL;
        }
 
-       diff = ldb_msg_diff(PyLdb_AsLdbContext(self), PyLdbMessage_AsMessage(py_msg_old), PyLdbMessage_AsMessage(py_msg_new));
-       if (!diff) {
-               PyErr_SetString(PyExc_KeyError, "Failed to generate the Ldb Message diff");
+       ldb = PyLdb_AsLdbContext(self);
+       ldb_ret = ldb_msg_diff_ex(ldb,
+                                 PyLdbMessage_AsMessage(py_msg_old),
+                                 PyLdbMessage_AsMessage(py_msg_new),
+                                 (TALLOC_CTX*)ldb, &diff);
+       if (ldb_ret != LDB_SUCCESS) {
+               PyErr_SetString(PyExc_RuntimeError, "Failed to generate the Ldb Message diff");
                return NULL;
        }
 
        py_ret = PyLdbMessage_FromMessage(diff);
 
+       talloc_unlink(ldb, diff);
+
        return py_ret;
 }
 
@@ -1005,7 +1111,7 @@ static PyObject *py_ldb_schema_format_value(PyLdbObject *self, PyObject *args)
 static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwargs)
 {
        PyObject *py_base = Py_None;
-       enum ldb_scope scope = LDB_SCOPE_DEFAULT;
+       int scope = LDB_SCOPE_DEFAULT;
        char *expr = NULL;
        PyObject *py_attrs = Py_None;
        PyObject *py_controls = Py_None;
@@ -1018,20 +1124,30 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwar
        struct ldb_control **parsed_controls;
        struct ldb_dn *base;
        PyObject *py_ret;
+       TALLOC_CTX *mem_ctx;
 
+       /* type "int" rather than "enum" for "scope" is intentional */
        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OizOO",
                                         discard_const_p(char *, kwnames),
                                         &py_base, &scope, &expr, &py_attrs, &py_controls))
                return NULL;
 
+
+       mem_ctx = talloc_new(NULL);
+       if (mem_ctx == NULL) {
+               PyErr_NoMemory();
+               return NULL;
+       }
        ldb_ctx = PyLdb_AsLdbContext(self);
 
        if (py_attrs == Py_None) {
                attrs = NULL;
        } else {
-               attrs = PyList_AsStringList(NULL, py_attrs, "attrs");
-               if (attrs == NULL)
+               attrs = PyList_AsStringList(mem_ctx, py_attrs, "attrs");
+               if (attrs == NULL) {
+                       talloc_free(mem_ctx);
                        return NULL;
+               }
        }
 
        if (py_base == Py_None) {
@@ -1046,19 +1162,19 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwar
        if (py_controls == Py_None) {
                parsed_controls = NULL;
        } else {
-               const char **controls = PyList_AsStringList(ldb_ctx, py_controls, "controls");
-               parsed_controls = ldb_parse_control_strings(ldb_ctx, ldb_ctx, controls);
+               const char **controls = PyList_AsStringList(mem_ctx, py_controls, "controls");
+               parsed_controls = ldb_parse_control_strings(ldb_ctx, mem_ctx, controls);
                talloc_free(controls);
        }
 
-       res = talloc_zero(ldb_ctx, struct ldb_result);
+       res = talloc_zero(mem_ctx, struct ldb_result);
        if (res == NULL) {
                PyErr_NoMemory();
-               talloc_free(attrs);
+               talloc_free(mem_ctx);
                return NULL;
        }
 
-       ret = ldb_build_search_req(&req, ldb_ctx, ldb_ctx,
+       ret = ldb_build_search_req(&req, ldb_ctx, mem_ctx,
                                   base,
                                   scope,
                                   expr,
@@ -1071,7 +1187,7 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwar
        talloc_steal(req, attrs);
 
        if (ret != LDB_SUCCESS) {
-               talloc_free(res);
+               talloc_free(mem_ctx);
                PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
                return NULL;
        }
@@ -1082,17 +1198,15 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwar
                ret = ldb_wait(req->handle, LDB_WAIT_ALL);
        }
 
-       talloc_free(req);
-
        if (ret != LDB_SUCCESS) {
-               talloc_free(res);
+               talloc_free(mem_ctx);
                PyErr_LDB_ERROR_IS_ERR_RAISE(PyExc_LdbError, ret, ldb_ctx);
                return NULL;
        }
 
        py_ret = PyLdbResult_FromResult(res);
 
-       talloc_free(res);
+       talloc_free(mem_ctx);
 
        return py_ret;
 }
@@ -1157,6 +1271,9 @@ static PyMethodDef py_ldb_methods[] = {
        { "transaction_start", (PyCFunction)py_ldb_transaction_start, METH_NOARGS, 
                "S.transaction_start() -> None\n"
                "Start a new transaction." },
+       { "transaction_prepare_commit", (PyCFunction)py_ldb_transaction_prepare_commit, METH_NOARGS,
+               "S.transaction_prepare_commit() -> None\n"
+               "prepare to commit a new transaction (2-stage commit)." },
        { "transaction_commit", (PyCFunction)py_ldb_transaction_commit, METH_NOARGS, 
                "S.transaction_commit() -> None\n"
                "commit a new transaction." },
@@ -1281,7 +1398,7 @@ static PySequenceMethods py_ldb_seq = {
        .sq_contains = (objobjproc)py_ldb_contains,
 };
 
-PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx)
+static PyObject *PyLdb_FromLdbContext(struct ldb_context *ldb_ctx)
 {
        PyLdbObject *ret;
 
@@ -1302,7 +1419,7 @@ static void py_ldb_dealloc(PyLdbObject *self)
 }
 
 PyTypeObject PyLdb = {
-       .tp_name = "Ldb",
+       .tp_name = "ldb.Ldb",
        .tp_methods = py_ldb_methods,
        .tp_repr = (reprfunc)py_ldb_repr,
        .tp_new = py_ldb_new,
@@ -1353,6 +1470,7 @@ static PyObject *py_ldb_module_search(PyLdbModuleObject *self, PyObject *args, P
        struct ldb_module *mod;
        const char * const*attrs;
 
+       /* type "int" rather than "enum" for "scope" is intentional */
        if (!PyArg_ParseTupleAndKeywords(args, kwargs, "OiOO",
                                         discard_const_p(char *, kwnames),
                                         &py_base, &scope, &py_tree, &py_attrs))
@@ -1495,7 +1613,7 @@ static void py_ldb_module_dealloc(PyLdbModuleObject *self)
 }
 
 PyTypeObject PyLdbModule = {
-       .tp_name = "LdbModule",
+       .tp_name = "ldb.LdbModule",
        .tp_methods = py_ldb_module_methods,
        .tp_repr = (reprfunc)py_ldb_module_repr,
        .tp_str = (reprfunc)py_ldb_module_str,
@@ -1538,7 +1656,7 @@ struct ldb_message_element *PyObject_AsMessageElement(TALLOC_CTX *mem_ctx,
                me->values = talloc_array(me, struct ldb_val, me->num_values);
                me->values[0].length = PyString_Size(set_obj);
                me->values[0].data = talloc_memdup(me, 
-                       (uint8_t *)PyString_AsString(set_obj), me->values[0].length);
+                       (uint8_t *)PyString_AsString(set_obj), me->values[0].length+1);
        } else if (PySequence_Check(set_obj)) {
                int i;
                me->num_values = PySequence_Size(set_obj);
@@ -1548,7 +1666,7 @@ struct ldb_message_element *PyObject_AsMessageElement(TALLOC_CTX *mem_ctx,
 
                        me->values[i].length = PyString_Size(obj);
                        me->values[i].data = talloc_memdup(me, 
-                               (uint8_t *)PyString_AsString(obj), me->values[i].length);
+                               (uint8_t *)PyString_AsString(obj), me->values[i].length+1);
                }
        } else {
                talloc_free(me);
@@ -1693,7 +1811,7 @@ static PyObject *py_ldb_msg_element_new(PyTypeObject *type, PyObject *args, PyOb
                        el->values = talloc_array(el, struct ldb_val, 1);
                        el->values[0].length = PyString_Size(py_elements);
                        el->values[0].data = talloc_memdup(el, 
-                               (uint8_t *)PyString_AsString(py_elements), el->values[0].length);
+                               (uint8_t *)PyString_AsString(py_elements), el->values[0].length+1);
                } else if (PySequence_Check(py_elements)) {
                        el->num_values = PySequence_Size(py_elements);
                        el->values = talloc_array(el, struct ldb_val, el->num_values);
@@ -1708,7 +1826,7 @@ static PyObject *py_ldb_msg_element_new(PyTypeObject *type, PyObject *args, PyOb
                                }
                                el->values[i].length = PyString_Size(item);
                                el->values[i].data = talloc_memdup(el, 
-                                       (uint8_t *)PyString_AsString(item), el->values[i].length);
+                                       (uint8_t *)PyString_AsString(item), el->values[i].length+1);
                        }
                } else {
                        PyErr_SetString(PyExc_TypeError, 
@@ -1748,9 +1866,12 @@ static PyObject *py_ldb_msg_element_repr(PyLdbMessageElementObject *self)
                        element_str = talloc_asprintf_append(element_str, ",%s", PyObject_REPR(o));
        }
 
-       ret = PyString_FromFormat("MessageElement([%s])", element_str);
-
-       talloc_free(element_str);
+       if (element_str != NULL) {
+               ret = PyString_FromFormat("MessageElement([%s])", element_str);
+               talloc_free(element_str);
+       } else {
+               ret = PyString_FromString("MessageElement([])");
+       }
 
        return ret;
 }
@@ -1772,7 +1893,7 @@ static void py_ldb_msg_element_dealloc(PyLdbMessageElementObject *self)
 }
 
 PyTypeObject PyLdbMessageElement = {
-       .tp_name = "MessageElement",
+       .tp_name = "ldb.MessageElement",
        .tp_basicsize = sizeof(PyLdbMessageElementObject),
        .tp_dealloc = (destructor)py_ldb_msg_element_dealloc,
        .tp_repr = (reprfunc)py_ldb_msg_element_repr,
@@ -2025,8 +2146,45 @@ static void py_ldb_msg_dealloc(PyLdbMessageObject *self)
        self->ob_type->tp_free(self);
 }
 
+static int py_ldb_msg_compare(PyLdbMessageObject *py_msg1,
+                             PyLdbMessageObject *py_msg2)
+{
+       struct ldb_message *msg1 = PyLdbMessage_AsMessage(py_msg1),
+                          *msg2 = PyLdbMessage_AsMessage(py_msg2);
+       unsigned int i;
+       int ret;
+
+       if ((msg1->dn != NULL) || (msg2->dn != NULL)) {
+               ret = ldb_dn_compare(msg1->dn, msg2->dn);
+               if (ret != 0) {
+                       return ret;
+               }
+       }
+
+       ret = msg1->num_elements - msg2->num_elements;
+       if (ret != 0) {
+               return ret;
+       }
+
+       for (i = 0; i < msg1->num_elements; i++) {
+               ret = ldb_msg_element_compare_name(&msg1->elements[i],
+                                                  &msg2->elements[i]);
+               if (ret != 0) {
+                       return ret;
+               }
+
+               ret = ldb_msg_element_compare(&msg1->elements[i],
+                                             &msg2->elements[i]);
+               if (ret != 0) {
+                       return ret;
+               }
+       }
+
+       return 0;
+}
+
 PyTypeObject PyLdbMessage = {
-       .tp_name = "Message",
+       .tp_name = "ldb.Message",
        .tp_methods = py_ldb_msg_methods,
        .tp_getset = py_ldb_msg_getset,
        .tp_as_mapping = &py_ldb_msg_mapping,
@@ -2036,6 +2194,7 @@ PyTypeObject PyLdbMessage = {
        .tp_repr = (reprfunc)py_ldb_msg_repr,
        .tp_flags = Py_TPFLAGS_DEFAULT,
        .tp_iter = (getiterfunc)py_ldb_msg_iter,
+       .tp_compare = (cmpfunc)py_ldb_msg_compare,
 };
 
 PyObject *PyLdbTree_FromTree(struct ldb_parse_tree *tree)
@@ -2060,7 +2219,7 @@ static void py_ldb_tree_dealloc(PyLdbTreeObject *self)
 }
 
 PyTypeObject PyLdbTree = {
-       .tp_name = "Tree",
+       .tp_name = "ldb.Tree",
        .tp_basicsize = sizeof(PyLdbTreeObject),
        .tp_dealloc = (destructor)py_ldb_tree_dealloc,
        .tp_flags = Py_TPFLAGS_DEFAULT,
@@ -2369,10 +2528,12 @@ static PyObject *py_register_module(PyObject *module, PyObject *args)
 static PyObject *py_timestring(PyObject *module, PyObject *args)
 {
        time_t t;
+       unsigned long val;
        char *tresult;
        PyObject *ret;
-       if (!PyArg_ParseTuple(args, "L", &t))
+       if (!PyArg_ParseTuple(args, "l", &val))
                return NULL;
+       t = (time_t)val;
        tresult = ldb_timestring(NULL, t);
        ret = PyString_FromString(tresult);
        talloc_free(tresult);
@@ -2495,11 +2656,10 @@ void initldb(void)
        PyModule_AddObject(m, "ERR_AFFECTS_MULTIPLE_DSAS", PyInt_FromLong(LDB_ERR_AFFECTS_MULTIPLE_DSAS));
        PyModule_AddObject(m, "ERR_OTHER", PyInt_FromLong(LDB_ERR_OTHER));
 
-        PyModule_AddObject(m, "FLG_RDONLY", PyInt_FromLong(LDB_FLG_RDONLY));
-        PyModule_AddObject(m, "FLG_NOSYNC", PyInt_FromLong(LDB_FLG_NOSYNC));
-        PyModule_AddObject(m, "FLG_RECONNECT", PyInt_FromLong(LDB_FLG_RECONNECT));
-        PyModule_AddObject(m, "FLG_NOMMAP", PyInt_FromLong(LDB_FLG_NOMMAP));
-
+       PyModule_AddObject(m, "FLG_RDONLY", PyInt_FromLong(LDB_FLG_RDONLY));
+       PyModule_AddObject(m, "FLG_NOSYNC", PyInt_FromLong(LDB_FLG_NOSYNC));
+       PyModule_AddObject(m, "FLG_RECONNECT", PyInt_FromLong(LDB_FLG_RECONNECT));
+       PyModule_AddObject(m, "FLG_NOMMAP", PyInt_FromLong(LDB_FLG_NOMMAP));
 
        PyModule_AddObject(m, "__docformat__", PyString_FromString("restructuredText"));