Fix more introduced regressions in new bindings.

5 files changed, 116 insertions, 95 deletions

diff --git a/source4/lib/ldb/pyldb.c b/source4/lib/ldb/pyldb.c
index 340e02cafa..9b1380a655 100644
--- a/source4/lib/ldb/pyldb.c
+++ b/source4/lib/ldb/pyldb.c
@@ -33,10 +33,16 @@
 #include "ldb_errors.h"
 #include "ldb_private.h"
 
+/* Picked out of thin air. To do this properly, we should probably have some part of the 
+ * errors in LDB be allocated to bindings ? */
+#define LDB_ERR_PYTHON_EXCEPTION	142
+
 PyObject *PyExc_LdbError;
 
 void PyErr_SetLdbError(int ret, struct ldb_context *ldb_ctx)
 {
+	if (ret == LDB_ERR_PYTHON_EXCEPTION)
+		return; /* Python exception should already be set, just keep that */
 	PyErr_SetObject(PyExc_LdbError, Py_BuildValue((char *)"(i,s)", ret, ldb_ctx == NULL?ldb_strerror(ret):ldb_errstring(ldb_ctx)));
 }
 PyObject *PyObject_FromLdbValue(struct ldb_context *ldb_ctx, 
@@ -97,8 +103,7 @@ static PyObject *PyLdbResult_FromResult(struct ldb_result *result)
 	} 
 	ret = PyList_New(result->count);
 	for (i = 0; i < result->count; i++) {
-		PyList_SetItem(ret, i, 
-					   PyLdbMessage_FromMessage(result->msgs[i])
+		PyList_SetItem(ret, i, PyLdbMessage_FromMessage(result->msgs[i])
 		);
 	}
 	return ret;
@@ -610,14 +615,17 @@ 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))
 		return NULL;
 
-	if (!PyObject_AsDn(NULL, py_dn, PyLdb_AsLdbContext(self), &dn))
+	ldb = PyLdb_AsLdbContext(self);
+
+	if (!PyObject_AsDn(NULL, py_dn, ldb, &dn))
 		return NULL;
 
-	ret = ldb_delete(PyLdb_AsLdbContext(self), dn);
-	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, PyLdb_AsLdbContext(self));
+	ret = ldb_delete(ldb, dn);
+	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, ldb);
 
 	return Py_None;
 }
@@ -627,22 +635,19 @@ static PyObject *py_ldb_rename(PyLdbObject *self, PyObject *args)
 	PyObject *py_dn1, *py_dn2;
 	struct ldb_dn *dn1, *dn2;
 	int ret;
+	struct ldb_context *ldb;
 	if (!PyArg_ParseTuple(args, "OO", &py_dn1, &py_dn2))
 		return NULL;
 
-	if (!PyLdbDn_Check(py_dn1) || !PyLdbDn_Check(py_dn2)) {
-		PyErr_SetString(PyExc_TypeError, "Expected Ldb Dn");
-		return NULL;
-	}
-
-	if (!PyObject_AsDn(NULL, py_dn1, PyLdb_AsLdbContext(self), &dn1))
+	ldb = PyLdb_AsLdbContext(self);
+	if (!PyObject_AsDn(NULL, py_dn1, ldb, &dn1))
 		return NULL;
 
-	if (!PyObject_AsDn(NULL, py_dn2, PyLdb_AsLdbContext(self), &dn2))
+	if (!PyObject_AsDn(NULL, py_dn2, ldb, &dn2))
 		return NULL;
 
-	ret = ldb_rename(PyLdb_AsLdbContext(self), dn1, dn2);
-	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, PyLdb_AsLdbContext(self));
+	ret = ldb_rename(ldb, dn1, dn2);
+	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, ldb);
 
 	return Py_None;
 }
@@ -754,7 +759,7 @@ static PyObject *py_ldb_search(PyLdbObject *self, PyObject *args, PyObject *kwar
 	struct ldb_control **parsed_controls;
 	struct ldb_dn *base;
 
-	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OisOO", (char **)kwnames,
+	if (!PyArg_ParseTupleAndKeywords(args, kwargs, "|OizOO", (char **)kwnames,
 									 &py_base, &scope, &expr, &py_attrs, &py_controls))
 		return NULL;
 
@@ -826,9 +831,12 @@ static PyObject *py_ldb_get_opaque(PyLdbObject *self, PyObject *args)
 
 	data = ldb_get_opaque(PyLdb_AsLdbContext(self), name);
 
+	if (data == NULL)
+		return Py_None;
+
 	/* FIXME: More interpretation */
 
-	return Py_None; 
+	return Py_True;
 }
 
 static PyObject *py_ldb_set_opaque(PyLdbObject *self, PyObject *args)
@@ -846,6 +854,19 @@ static PyObject *py_ldb_set_opaque(PyLdbObject *self, PyObject *args)
 	return Py_None;
 }
 
+static PyObject *py_ldb_modules(PyLdbObject *self)
+{
+	struct ldb_context *ldb = PyLdb_AsLdbContext(self);
+	PyObject *ret = PyList_New(0);
+	struct ldb_module *mod;
+
+	for (mod = ldb->modules; mod; mod = mod->next) {
+		PyList_Append(ret, PyLdbModule_FromModule(mod));
+	}
+
+	return ret;
+}
+
 static PyMethodDef py_ldb_methods[] = {
 	{ "set_debug", (PyCFunction)py_ldb_set_debug, METH_VARARGS, 
 		"S.set_debug(callback) -> None\n"
@@ -911,15 +932,18 @@ static PyMethodDef py_ldb_methods[] = {
 	{ "parse_ldif", (PyCFunction)py_ldb_parse_ldif, METH_VARARGS,
 		"S.parse_ldif(ldif) -> iter(messages)\n"
 		"Parse a string formatted using LDIF." },
-	{ "get_opaque", (PyCFunction)py_ldb_set_opaque, METH_VARARGS,
+	{ "get_opaque", (PyCFunction)py_ldb_get_opaque, METH_VARARGS,
 		"S.get_opaque(name) -> value\n"
 		"Get an opaque value set on this LDB connection. \n"
 		":note: The returned value may not be useful in Python."
 	},
-	{ "set_opaque", (PyCFunction)py_ldb_get_opaque, METH_VARARGS,
+	{ "set_opaque", (PyCFunction)py_ldb_set_opaque, METH_VARARGS,
 		"S.set_opaque(name, value) -> None\n"
 		"Set an opaque value on this LDB connection. \n"
 		":note: Passing incorrect values may cause crashes." },
+	{ "modules", (PyCFunction)py_ldb_modules, METH_NOARGS,
+		"S.modules() -> list\n"
+		"Return the list of modules on this LDB connection " },
 	{ NULL },
 };
 
@@ -1025,26 +1049,17 @@ static PyObject *py_ldb_module_search(PyLdbModuleObject *self, PyObject *args, P
 									 &py_base, &scope, &py_tree, &py_attrs))
 		return NULL;
 
-	req = talloc_zero(NULL, struct ldb_request);
-
-	req->operation = LDB_SEARCH;
-	req->op.search.base = PyLdbDn_AsDn(py_base);
-	req->op.search.scope = scope;
-	req->op.search.tree = PyLdbTree_AsTree(py_tree);
-	if (py_attrs == Py_None) {
-		req->op.search.attrs = NULL;
-	} else {
-		req->op.search.attrs = PyList_AsStringList(req, py_attrs);
-	}
-
-	req->op.search.res = talloc_zero(NULL, struct ldb_result);
-
 	mod = self->ptr;
 
+	ret = ldb_build_search_req(&req, mod->ldb, NULL, PyLdbDn_AsDn(py_base), 
+			     scope, NULL /* expr */, py_attrs == Py_None?NULL:PyList_AsStringList(req, py_attrs),
+			     NULL /* controls */, NULL, NULL, NULL);
+	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, mod->ldb);
+
 	ret = mod->ops->search(mod, req);
 	talloc_free(req);
 
-	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, NULL);
+	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, mod->ldb);
 
 	return PyLdbResult_FromResult(req->op.search.res);
 }
@@ -1055,6 +1070,7 @@ static PyObject *py_ldb_module_add(PyLdbModuleObject *self, PyObject *args)
 	struct ldb_request *req;
 	PyObject *py_message;
 	int ret;
+	struct ldb_module *mod;
 
 	if (!PyArg_ParseTuple(args, "O", &py_message))
 		return NULL;
@@ -1063,9 +1079,10 @@ static PyObject *py_ldb_module_add(PyLdbModuleObject *self, PyObject *args)
 	req->operation = LDB_ADD;
 	req->op.add.message = PyLdbMessage_AsMessage(py_message);
 
-	ret = PyLdbModule_AsModule(self)->ops->add(PyLdbModule_AsModule(self), req);
+	mod = PyLdbModule_AsModule(self);
+	ret = mod->ops->add(mod, req);
 
-	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, NULL);
+	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, mod->ldb);
 
 	return Py_None;
 }
@@ -1075,6 +1092,7 @@ static PyObject *py_ldb_module_modify(PyLdbModuleObject *self, PyObject *args)
 	int ret;
 	struct ldb_request *req;
 	PyObject *py_message;
+	struct ldb_module *mod;
 
 	if (!PyArg_ParseTuple(args, "O", &py_message))
 		return NULL;
@@ -1083,9 +1101,10 @@ static PyObject *py_ldb_module_modify(PyLdbModuleObject *self, PyObject *args)
 	req->operation = LDB_MODIFY;
 	req->op.mod.message = PyLdbMessage_AsMessage(py_message);
 	
-	ret = PyLdbModule_AsModule(self)->ops->modify(PyLdbModule_AsModule(self), req);
+	mod = PyLdbModule_AsModule(self);
+	ret = mod->ops->modify(mod, req);
 
-	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, NULL);
+	PyErr_LDB_ERROR_IS_ERR_RAISE(ret, mod->ldb);
 
 	return Py_None;
 }
@@ -1418,6 +1437,16 @@ static PyMethodDef py_ldb_msg_methods[] = {
 	{ NULL },
 };
 
+static PyObject *py_ldb_msg_iter(PyLdbMessageObject *self)
+{
+	PyObject *list, *iter;
+
+	list = py_ldb_msg_keys(self);
+	iter = PyObject_GetIter(list);
+	Py_DECREF(list);
+	return iter;
+}
+
 static int py_ldb_msg_setitem(PyLdbMessageObject *self, PyObject *name, PyObject *value)
 {
 	char *attr_name = PyString_AsString(name);
@@ -1508,6 +1537,7 @@ PyTypeObject PyLdbMessage = {
 	.tp_new = py_ldb_msg_new,
 	.tp_repr = (reprfunc)py_ldb_msg_repr,
 	.tp_flags = Py_TPFLAGS_DEFAULT,
+	.tp_iter = (getiterfunc)py_ldb_msg_iter,
 };
 
 PyObject *PyLdbTree_FromTree(struct ldb_parse_tree *tree)
@@ -1555,12 +1585,12 @@ int py_module_search(struct ldb_module *mod, struct ldb_request *req)
 	Py_DECREF(py_base);
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	req->op.search.res = PyLdbResult_AsResult(NULL, py_result);
 	if (req->op.search.res == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	Py_DECREF(py_result);
@@ -1584,7 +1614,7 @@ int py_module_add(struct ldb_module *mod, struct ldb_request *req)
 	Py_DECREF(py_msg);
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	Py_DECREF(py_result);
@@ -1608,7 +1638,7 @@ int py_module_modify(struct ldb_module *mod, struct ldb_request *req)
 	Py_DECREF(py_msg);
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	Py_DECREF(py_result);
@@ -1629,7 +1659,7 @@ int py_module_del(struct ldb_module *mod, struct ldb_request *req)
 	py_result = PyObject_CallMethod(py_ldb, (char *)"delete", (char *)"O", py_dn);
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	Py_DECREF(py_result);
@@ -1658,7 +1688,7 @@ int py_module_rename(struct ldb_module *mod, struct ldb_request *req)
 	Py_DECREF(py_newdn);
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	Py_DECREF(py_result);
@@ -1694,7 +1724,7 @@ int py_module_start_transaction(struct ldb_module *mod)
 	py_result = PyObject_CallMethod(py_ldb, (char *)"start_transaction", (char *)"");
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	Py_DECREF(py_result);
@@ -1710,7 +1740,7 @@ int py_module_end_transaction(struct ldb_module *mod)
 	py_result = PyObject_CallMethod(py_ldb, (char *)"end_transaction", (char *)"");
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	Py_DECREF(py_result);
@@ -1726,7 +1756,7 @@ int py_module_del_transaction(struct ldb_module *mod)
 	py_result = PyObject_CallMethod(py_ldb, (char *)"del_transaction", (char *)"");
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	Py_DECREF(py_result);
@@ -1758,7 +1788,7 @@ int py_module_init (struct ldb_module *mod)
 	py_result = PyObject_CallFunction(py_class, (char *)"OO", py_ldb, py_next);
 
 	if (py_result == NULL) {
-		return LDB_ERR_OPERATIONS_ERROR;
+		return LDB_ERR_PYTHON_EXCEPTION;
 	}
 
 	mod->private_data = py_result;
diff --git a/source4/lib/ldb/pyldb.h b/source4/lib/ldb/pyldb.h
index c71f1afc72..4ffc21325a 100644
--- a/source4/lib/ldb/pyldb.h
+++ b/source4/lib/ldb/pyldb.h
@@ -56,7 +56,7 @@ struct ldb_message *PyLdbMessage_AsMessage(PyObject *obj);
 typedef py_talloc_Object PyLdbModuleObject;
 PyAPI_DATA(PyTypeObject) PyLdbModule;
 PyObject *PyLdbModule_FromModule(struct ldb_module *mod);
-#define PyLdbModule_AsModule(pyobj) py_talloc_get_type(pyobj, struct ldb_module)
+#define PyLdbModule_AsModule(pyobj) ((struct ldb_module *)py_talloc_get_ptr(pyobj))
 
 typedef py_talloc_Object PyLdbMessageElementObject;
 PyAPI_DATA(PyTypeObject) PyLdbMessageElement;
diff --git a/source4/lib/ldb/tests/python/api.py b/source4/lib/ldb/tests/python/api.py
index 62bc5b7328..c372b8fa71 100755
--- a/source4/lib/ldb/tests/python/api.py
+++ b/source4/lib/ldb/tests/python/api.py
@@ -10,6 +10,9 @@ sys.path.append("build/lib.linux-i686-2.4")
 
 import ldb
 
+def filename():
+    return os.tempnam()
+
 class NoContextTests(unittest.TestCase):
     def test_valid_attr_name(self):
         self.assertTrue(ldb.valid_attr_name("foo"))
@@ -26,14 +29,14 @@ class NoContextTests(unittest.TestCase):
 
 class SimpleLdb(unittest.TestCase):
     def test_connect(self):
-        ldb.Ldb("foo.ldb")
+        ldb.Ldb(filename())
 
     def test_connect_none(self):
         ldb.Ldb()
 
     def test_connect_later(self):
         x = ldb.Ldb()
-        x.connect("foo.ldb")
+        x.connect(filename())
 
     def test_repr(self):
         x = ldb.Ldb()
@@ -56,19 +59,19 @@ class SimpleLdb(unittest.TestCase):
         self.assertEquals("[<ldb module 'tdb'>]", repr(x.modules()))
 
     def test_search(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(len(l.search()), 1)
 
     def test_search_controls(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(len(l.search(controls=["paged_results:0:5"])), 1)
 
     def test_search_attrs(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(len(l.search(ldb.Dn(l, ""), ldb.SCOPE_SUBTREE, "(dc=*)", ["dc"])), 0)
 
     def test_search_string_dn(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(len(l.search("", ldb.SCOPE_SUBTREE, "(dc=*)", ["dc"])), 0)
 
     def test_search_attr_string(self):
@@ -76,29 +79,24 @@ class SimpleLdb(unittest.TestCase):
         self.assertRaises(TypeError, l.search, attrs="dc")
 
     def test_opaque(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         l.set_opaque("my_opaque", l)
         self.assertTrue(l.get_opaque("my_opaque") is not None)
         self.assertEquals(None, l.get_opaque("unknown"))
 
-    def test_parse_control_strings(self):
-        l = ldb.Ldb("foo.ldb")
-        self.assertRaises(ldb.LdbError, l.parse_control_strings, ["foo", "bar"])
-        self.assertTrue(l.parse_control_strings(["paged_results:0:5"]) is not None)
-
     def test_search_scope_base(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(len(l.search(ldb.Dn(l, "dc=foo"), 
                           ldb.SCOPE_ONELEVEL)), 0)
 
     def test_delete(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertRaises(ldb.LdbError, lambda: l.delete(ldb.Dn(l, "dc=foo")))
 
     def test_contains(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertFalse(ldb.Dn(l, "dc=foo") in l)
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=foo")
         m["b"] = ["a"]
@@ -109,23 +107,23 @@ class SimpleLdb(unittest.TestCase):
             l.delete(m.dn)
 
     def test_get_config_basedn(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(None, l.get_config_basedn())
 
     def test_get_root_basedn(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(None, l.get_root_basedn())
 
     def test_get_schema_basedn(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(None, l.get_schema_basedn())
 
     def test_get_default_basedn(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         self.assertEquals(None, l.get_default_basedn())
 
     def test_add(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=foo")
         m["bla"] = "bla"
@@ -137,7 +135,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=foo"))
 
     def test_add_dict(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = {"dn": ldb.Dn(l, "dc=foo"),
              "bla": "bla"}
         self.assertEquals(len(l.search()), 1)
@@ -148,7 +146,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=foo"))
 
     def test_add_dict_string_dn(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = {"dn": "dc=foo", "bla": "bla"}
         self.assertEquals(len(l.search()), 1)
         l.add(m)
@@ -158,7 +156,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=foo"))
 
     def test_rename(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=foo")
         m["bla"] = "bla"
@@ -171,12 +169,13 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=bar"))
 
     def test_rename_string_dns(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=foo")
         m["bla"] = "bla"
         self.assertEquals(len(l.search()), 1)
         l.add(m)
+        self.assertEquals(len(l.search()), 2)
         try:
             l.rename("dc=foo", "dc=bar")
             self.assertEquals(len(l.search()), 2)
@@ -184,7 +183,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=bar"))
 
     def test_modify_delete(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=modifydelete")
         m["bla"] = ["1234"]
@@ -202,7 +201,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=modifydelete"))
 
     def test_modify_add(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=add")
         m["bla"] = ["1234"]
@@ -219,7 +218,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=add"))
 
     def test_modify_modify(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         m = ldb.Message()
         m.dn = ldb.Dn(l, "dc=modify2")
         m["bla"] = ["1234", "456"]
@@ -236,7 +235,7 @@ class SimpleLdb(unittest.TestCase):
             l.delete(ldb.Dn(l, "dc=modify2"))
 
     def test_transaction_commit(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         l.transaction_start()
         m = ldb.Message(ldb.Dn(l, "dc=foo"))
         m["foo"] = ["bar"]
@@ -245,7 +244,7 @@ class SimpleLdb(unittest.TestCase):
         l.delete(m.dn)
 
     def test_transaction_cancel(self):
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         l.transaction_start()
         m = ldb.Message(ldb.Dn(l, "dc=foo"))
         m["foo"] = ["bar"]
@@ -256,13 +255,13 @@ class SimpleLdb(unittest.TestCase):
     def test_set_debug(self):
         def my_report_fn(level, text):
             pass
-        l = ldb.Ldb("foo.ldb")
+        l = ldb.Ldb(filename())
         l.set_debug(my_report_fn)
 
 
 class DnTests(unittest.TestCase):
     def setUp(self):
-        self.ldb = ldb.Ldb("foo.ldb")
+        self.ldb = ldb.Ldb(filename())
 
     def test_eq(self):
         x = ldb.Dn(self.ldb, "dc=foo,bar=bloe")
@@ -411,7 +410,7 @@ class LdbMsgTests(unittest.TestCase):
         self.assertEquals(["dn", "foo", "bar"], self.msg.keys())
 
     def test_dn(self):
-        self.msg.dn = ldb.Dn(ldb.Ldb("foo.ldb"), "@BASEINFO")
+        self.msg.dn = ldb.Dn(ldb.Ldb(filename()), "@BASEINFO")
         self.assertEquals("@BASEINFO", self.msg.dn.__str__())
 
     def test_get_dn(self):
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index 2d0af630c1..55eb618426 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -29,6 +29,7 @@
 #include "libcli/util/pyerrors.h"
 #include "librpc/gen_ndr/py_misc.h"
 #include "librpc/gen_ndr/py_security.h"
+#include "libcli/security/security.h"
 #include "auth/pyauth.h"
 
 /* FIXME: These should be in a header file somewhere, once we finish moving
@@ -146,12 +147,7 @@ static PyObject *py_samdb_set_domain_sid(PyLdbObject *self, PyObject *args)
 	
 	PyErr_LDB_OR_RAISE(py_ldb, ldb);
 
-	if (!dom_sid_Check(py_sid)) {
-		PyErr_SetString(PyExc_TypeError, "expected SID");
-		return NULL;
-	}
-
-	sid = py_talloc_get_ptr(py_sid);
+	sid = dom_sid_parse_talloc(NULL, PyString_AsString(py_sid));
 
 	ret = samdb_set_domain_sid(ldb, sid);
 	if (!ret) {
@@ -181,19 +177,15 @@ static PyObject *py_dsdb_set_ntds_invocation_id(PyObject *self, PyObject *args)
 {
 	PyObject *py_ldb, *py_guid;
 	bool ret;
-	struct GUID *guid;
+	struct GUID guid;
 	struct ldb_context *ldb;
 	if (!PyArg_ParseTuple(args, "OO", &py_ldb, &py_guid))
 		return NULL;
 
 	PyErr_LDB_OR_RAISE(py_ldb, ldb);
-	if (!GUID_Check(py_guid)) {
-		PyErr_SetString(PyExc_TypeError, "Expected GUID");
-		return NULL;
-	}
-	guid = py_talloc_get_ptr(py_guid);
+	GUID_from_string(PyString_AsString(py_guid), &guid);
 
-	ret = samdb_set_ntds_invocation_id(ldb, guid);
+	ret = samdb_set_ntds_invocation_id(ldb, &guid);
 	if (!ret) {
 		PyErr_SetString(PyExc_RuntimeError, "set_ntds_invocation_id failed");
 		return NULL;
diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py
index 0819a0c8bf..1da4e885f5 100644
--- a/source4/scripting/python/samba/provision.py
+++ b/source4/scripting/python/samba/provision.py
@@ -752,7 +752,7 @@ def setup_samdb(path, setup_path, session_info, credentials, lp,
         return samdb
 
     message("Pre-loading the Samba 4 and AD schema")
-    samdb.set_domain_sid(domainsid)
+    samdb.set_domain_sid(str(domainsid))
     if serverrole == "domain controller":
         samdb.set_invocation_id(invocationid)