summaryrefslogtreecommitdiff
path: root/source4/scripting/python
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-04-08 03:26:39 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-04-08 12:21:35 +0200
commit2578072541e880c83089fdd278d81467e91ddc5a (patch)
tree882672fdfe1015b5f6660dbe0acbdc3eb5199026 /source4/scripting/python
parenta1e47e3dd2beb0c46bfc90095b066ffd64706529 (diff)
downloadsamba-2578072541e880c83089fdd278d81467e91ddc5a.tar.gz
samba-2578072541e880c83089fdd278d81467e91ddc5a.tar.bz2
samba-2578072541e880c83089fdd278d81467e91ddc5a.zip
s4-python: Move set_global_schema to pydsdb.
Diffstat (limited to 'source4/scripting/python')
-rw-r--r--source4/scripting/python/pyglue.c18
-rw-r--r--source4/scripting/python/samba/samdb.py2
2 files changed, 1 insertions, 19 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c
index 8d19b06ddf..bf6c30b5f8 100644
--- a/source4/scripting/python/pyglue.c
+++ b/source4/scripting/python/pyglue.c
@@ -117,22 +117,6 @@ static PyObject *py_set_debug_level(PyObject *self, PyObject *args)
Py_RETURN_NONE;
}
-static PyObject *py_dsdb_set_global_schema(PyObject *self, PyObject *args)
-{
- PyObject *py_ldb;
- struct ldb_context *ldb;
- int ret;
- if (!PyArg_ParseTuple(args, "O", &py_ldb))
- return NULL;
-
- PyErr_LDB_OR_RAISE(py_ldb, ldb);
-
- ret = dsdb_set_global_schema(ldb);
- PyErr_LDB_ERROR_IS_ERR_RAISE(py_ldb_get_exception(), ret, ldb);
-
- Py_RETURN_NONE;
-}
-
static PyObject *py_dsdb_set_schema_from_ldif(PyObject *self, PyObject *args)
{
WERROR result;
@@ -310,8 +294,6 @@ static PyMethodDef py_misc_methods[] = {
"Generate random password with a length >= min and <= max." },
{ "unix2nttime", (PyCFunction)py_unix2nttime, METH_VARARGS,
"unix2nttime(timestamp) -> nttime" },
- { "dsdb_set_global_schema", (PyCFunction)py_dsdb_set_global_schema, METH_VARARGS,
- NULL },
{ "dsdb_set_schema_from_ldif", (PyCFunction)py_dsdb_set_schema_from_ldif, METH_VARARGS,
NULL },
{ "dsdb_write_prefixes_from_schema_to_ldb", (PyCFunction)py_dsdb_write_prefixes_from_schema_to_ldb, METH_VARARGS,
diff --git a/source4/scripting/python/samba/samdb.py b/source4/scripting/python/samba/samdb.py
index 8d4c3deecd..5d20359690 100644
--- a/source4/scripting/python/samba/samdb.py
+++ b/source4/scripting/python/samba/samdb.py
@@ -48,7 +48,7 @@ class SamDB(samba.Ldb):
options=options)
if global_schema:
- glue.dsdb_set_global_schema(self)
+ dsdb.dsdb_set_global_schema(self)
def connect(self, url=None, flags=0, options=None):
super(SamDB, self).connect(url=self.lp.private_path(url), flags=flags,