sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

pydsdb: Move write_prefixes_from_schema_to_ldb to pydsdb from pyglue.

Browse Source
This commit is contained in:
Jelmer Vernooij 2010-06-19 17:15:26 +02:00
parent a4f60ffe4b
commit 74309eb29c
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
source4/dsdb/pydsdb.c
View File

@ -435,6 +435,30 @@ static PyObject *py_dsdb_set_schema_from_ldb(PyObject *self, PyObject *args)
Py_RETURN_NONE;
}
static PyObject *py_dsdb_write_prefixes_from_schema_to_ldb(PyObject *self, PyObject *args)
{
PyObject *py_ldb;
struct ldb_context *ldb;
WERROR result;
struct dsdb_schema *schema;
if (!PyArg_ParseTuple(args, "O", &py_ldb))
return NULL;
PyErr_LDB_OR_RAISE(py_ldb, ldb);
schema = dsdb_get_schema(ldb, NULL);
if (!schema) {
PyErr_SetString(PyExc_RuntimeError, "Failed to set find a schema on ldb!\n");
return NULL;
}
result = dsdb_write_prefixes_from_schema_to_ldb(NULL, ldb, schema);
PyErr_WERROR_IS_ERR_RAISE(result);
Py_RETURN_NONE;
}
static PyMethodDef py_dsdb_methods[] = {
@ -477,6 +501,8 @@ static PyMethodDef py_dsdb_methods[] = {
NULL },
{ "dsdb_set_schema_from_ldb", (PyCFunction)py_dsdb_set_schema_from_ldb, METH_VARARGS,
NULL },
{ "dsdb_write_prefixes_from_schema_to_ldb", (PyCFunction)py_dsdb_write_prefixes_from_schema_to_ldb, METH_VARARGS,
NULL },
{ NULL }
};

26
source4/scripting/python/pyglue.c
View File

@ -131,30 +131,6 @@ static PyObject *py_set_debug_level(PyObject *self, PyObject *args)
static PyObject *py_dsdb_write_prefixes_from_schema_to_ldb(PyObject *self, PyObject *args)
{
PyObject *py_ldb;
struct ldb_context *ldb;
WERROR result;
struct dsdb_schema *schema;
if (!PyArg_ParseTuple(args, "O", &py_ldb))
return NULL;
PyErr_LDB_OR_RAISE(py_ldb, ldb);
schema = dsdb_get_schema(ldb, NULL);
if (!schema) {
PyErr_SetString(PyExc_RuntimeError, "Failed to set find a schema on ldb!\n");
return NULL;
}
result = dsdb_write_prefixes_from_schema_to_ldb(NULL, ldb, schema);
PyErr_WERROR_IS_ERR_RAISE(result);
Py_RETURN_NONE;
}
/*
return the list of interface IPs we have configured
takes an loadparm context, returns a list of IPs in string form
@ -222,8 +198,6 @@ static PyMethodDef py_misc_methods[] = {
"nttime2unix(nttime) -> timestamp" },
{ "nttime2string", (PyCFunction)py_nttime2string, METH_VARARGS,
"nttime2string(nttime) -> string" },
{ "dsdb_write_prefixes_from_schema_to_ldb", (PyCFunction)py_dsdb_write_prefixes_from_schema_to_ldb, METH_VARARGS,
NULL },
{ "set_debug_level", (PyCFunction)py_set_debug_level, METH_VARARGS,
"set debug level" },
{ "interface_ips", (PyCFunction)py_interface_ips, METH_VARARGS,

2
source4/scripting/python/samba/__init__.py
View File

@ -287,7 +287,7 @@ class Ldb(_Ldb):
dsdb.dsdb_set_schema_from_ldb(self, ldb)
def write_prefixes_from_schema(self):
_glue.dsdb_write_prefixes_from_schema_to_ldb(self)
dsdb.dsdb_write_prefixes_from_schema_to_ldb(self)
def convert_schema_to_openldap(self, target, mapping):
return dsdb.dsdb_convert_schema_to_openldap(self, target, mapping)