From 05b108a06b383f2172a379629b9a6bcff82c6868 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 19 Jun 2010 16:52:09 +0200 Subject: pydsdb: Move set_schema_from_ldif function to pydsdb from pyglue. --- source4/scripting/python/pyglue.c | 18 ------------------ source4/scripting/python/samba/__init__.py | 2 +- 2 files changed, 1 insertion(+), 19 deletions(-) (limited to 'source4/scripting/python') diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index e1c4feaf16..8dc80505d6 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -148,23 +148,7 @@ static PyObject *py_set_debug_level(PyObject *self, PyObject *args) Py_RETURN_NONE; } -static PyObject *py_dsdb_set_schema_from_ldif(PyObject *self, PyObject *args) -{ - WERROR result; - char *pf, *df; - PyObject *py_ldb; - struct ldb_context *ldb; - if (!PyArg_ParseTuple(args, "Oss", &py_ldb, &pf, &df)) - return NULL; - - PyErr_LDB_OR_RAISE(py_ldb, ldb); - - result = dsdb_set_schema_from_ldif(ldb, pf, df); - PyErr_WERROR_IS_ERR_RAISE(result); - - Py_RETURN_NONE; -} static PyObject *py_dsdb_write_prefixes_from_schema_to_ldb(PyObject *self, PyObject *args) { @@ -284,8 +268,6 @@ static PyMethodDef py_misc_methods[] = { "nttime2unix(nttime) -> timestamp" }, { "nttime2string", (PyCFunction)py_nttime2string, METH_VARARGS, "nttime2string(nttime) -> string" }, - { "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, NULL }, { "dsdb_set_schema_from_ldb", (PyCFunction)py_dsdb_set_schema_from_ldb, METH_VARARGS, diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index ce408de049..d03cdc13a5 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -278,7 +278,7 @@ class Ldb(_Ldb): dsdb.samdb_get_domain_sid(self) def set_schema_from_ldif(self, pf, df): - _glue.dsdb_set_schema_from_ldif(self, pf, df) + dsdb.dsdb_set_schema_from_ldif(self, pf, df) def get_oid_from_attid(self, attid): return dsdb.dsdb_get_oid_from_attid(self, attid) -- cgit