diff options
Diffstat (limited to 'source4/scripting/python')
-rw-r--r-- | source4/scripting/python/pyglue.c | 26 | ||||
-rw-r--r-- | source4/scripting/python/samba/__init__.py | 3 | ||||
-rw-r--r-- | source4/scripting/python/samba/provision.py | 2 |
3 files changed, 31 insertions, 0 deletions
diff --git a/source4/scripting/python/pyglue.c b/source4/scripting/python/pyglue.c index f085714635..a80dedc717 100644 --- a/source4/scripting/python/pyglue.c +++ b/source4/scripting/python/pyglue.c @@ -159,6 +159,30 @@ static PyObject *py_dsdb_write_prefixes_from_schema_to_ldb(PyObject *self, PyObj Py_RETURN_NONE; } +static PyObject *py_dsdb_schema_info_reset(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_schema_info_reset(ldb, schema); + PyErr_WERROR_IS_ERR_RAISE(result); + + Py_RETURN_NONE; +} + static PyObject *py_dsdb_set_schema_from_ldb(PyObject *self, PyObject *args) { PyObject *py_ldb; @@ -253,6 +277,8 @@ static PyMethodDef py_misc_methods[] = { NULL }, { "dsdb_write_prefixes_from_schema_to_ldb", (PyCFunction)py_dsdb_write_prefixes_from_schema_to_ldb, METH_VARARGS, NULL }, + { "dsdb_schema_info_reset", (PyCFunction)py_dsdb_schema_info_reset, METH_VARARGS, + "Reset schemaInfo value to default for a new Forest" }, { "dsdb_set_schema_from_ldb", (PyCFunction)py_dsdb_set_schema_from_ldb, METH_VARARGS, NULL }, { "set_debug_level", (PyCFunction)py_set_debug_level, METH_VARARGS, diff --git a/source4/scripting/python/samba/__init__.py b/source4/scripting/python/samba/__init__.py index d7fc05cabd..682f40048b 100644 --- a/source4/scripting/python/samba/__init__.py +++ b/source4/scripting/python/samba/__init__.py @@ -283,6 +283,9 @@ class Ldb(_Ldb): def write_prefixes_from_schema(self): _glue.dsdb_write_prefixes_from_schema_to_ldb(self) + def set_schema_info(self): + _glue.dsdb_schema_info_reset(self) + def convert_schema_to_openldap(self, target, mapping): return dsdb.dsdb_convert_schema_to_openldap(self, target, mapping) diff --git a/source4/scripting/python/samba/provision.py b/source4/scripting/python/samba/provision.py index abbcf52210..2e4aa34a8c 100644 --- a/source4/scripting/python/samba/provision.py +++ b/source4/scripting/python/samba/provision.py @@ -945,6 +945,8 @@ def setup_samdb(path, setup_path, session_info, provision_backend, lp, message("Setting up sam.ldb schema") samdb.add_ldif(schema.schema_dn_add, controls=["relax:0"]) samdb.modify_ldif(schema.schema_dn_modify) + # set schemaInfo to defalt value for a new Forest + samdb.set_schema_info() samdb.write_prefixes_from_schema() samdb.add_ldif(schema.schema_data, controls=["relax:0"]) setup_add_ldif(samdb, setup_path("aggregate_schema.ldif"), |