diff options
author | Kamen Mazdrashki <kamenim@samba.org> | 2010-04-09 10:48:20 +0300 |
---|---|---|
committer | Kamen Mazdrashki <kamenim@samba.org> | 2010-04-09 12:21:34 +0300 |
commit | 8149094eddebd9a0e8b7c123c2ed54d00164bb26 (patch) | |
tree | dfe5731e4331d76fe88c39a0243e77e69a083ff2 | |
parent | 4ba2ac073d7a7859ab73f8b7f40d630ddbff8687 (diff) | |
download | samba-8149094eddebd9a0e8b7c123c2ed54d00164bb26.tar.gz samba-8149094eddebd9a0e8b7c123c2ed54d00164bb26.tar.bz2 samba-8149094eddebd9a0e8b7c123c2ed54d00164bb26.zip |
s4/dsdb: Set schemaInfo attribute value during provisioning
After provisioning new Forest, schemaInfo should be set
to a value with revision=1 and current invocation_id
-rw-r--r-- | source4/dsdb/schema/schema_info_attr.c | 49 | ||||
-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 |
4 files changed, 80 insertions, 0 deletions
diff --git a/source4/dsdb/schema/schema_info_attr.c b/source4/dsdb/schema/schema_info_attr.c index ea4d066ff1..bb89be1172 100644 --- a/source4/dsdb/schema/schema_info_attr.c +++ b/source4/dsdb/schema/schema_info_attr.c @@ -355,6 +355,55 @@ WERROR dsdb_schema_info_create(struct ldb_context *ldb, bool check_invocation_id /** + * + * @param ldb + * @param schema + * @return + */ +WERROR dsdb_schema_info_reset(struct ldb_context *ldb, struct dsdb_schema *schema) +{ + int ldb_err; + WERROR werr; + DATA_BLOB blob; + struct dsdb_schema_info *schema_info; + struct ldb_message *msg; + TALLOC_CTX *temp_ctx; + + temp_ctx = talloc_new(ldb); + W_ERROR_HAVE_NO_MEMORY(temp_ctx); + + /* create default schemaInfo value */ + werr = dsdb_schema_info_create(ldb, true, temp_ctx, &schema_info); + W_ERROR_NOT_OK_GOTO(werr, DONE); + + /* serialize schemaInfo to be stored in LDB and schema cache */ + werr = dsdb_blob_from_schema_info(schema_info, temp_ctx, &blob); + W_ERROR_NOT_OK_GOTO(werr, DONE); + + /* store initial schemaInfo in DB */ + werr = _dsdb_schema_info_write_prepare(ldb, &blob, temp_ctx, &msg); + W_ERROR_NOT_OK_GOTO(werr, DONE); + + ldb_err = dsdb_modify(ldb, msg, DSDB_MODIFY_PERMISSIVE); + if (ldb_err != 0) { + DEBUG(0,("dsdb_module_schema_info_blob_write: dsdb_replace failed: %s (%s)\n", + ldb_strerror(ldb_err), + ldb_errstring(ldb))); + werr = WERR_INTERNAL_DB_ERROR; + goto DONE; + } + + /* update dsdb_schema cache */ + talloc_free(discard_const(schema->schema_info)); + schema->schema_info = data_blob_hex_string_upper(schema, &blob); + +DONE: + talloc_free(temp_ctx); + return werr; +} + + +/** * Increments schemaInfo revision and save it to DB * setting our invocationID in the process * NOTE: this function should be called in a transaction 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"), |