diff options
| -rw-r--r-- | source4/dsdb/schema/tests/schema_syntax.c | 2 | ||||
| -rw-r--r-- | source4/libnet/libnet_vampire.c | 25 | ||||
| -rw-r--r-- | source4/param/provision.c | 8 | ||||
| -rw-r--r-- | source4/param/provision.h | 3 | ||||
| -rw-r--r-- | source4/scripting/python/samba/schema.py | 5 |
5 files changed, 37 insertions, 6 deletions
diff --git a/source4/dsdb/schema/tests/schema_syntax.c b/source4/dsdb/schema/tests/schema_syntax.c index efbaf5684c..5dae097583 100644 --- a/source4/dsdb/schema/tests/schema_syntax.c +++ b/source4/dsdb/schema/tests/schema_syntax.c @@ -201,7 +201,7 @@ static bool torture_dsdb_syntax_tcase_setup(struct torture_context *tctx, void * priv = talloc_zero(tctx, struct torture_dsdb_syntax); torture_assert(tctx, priv, "No memory"); - priv->ldb = provision_get_schema(priv, tctx->lp_ctx); + priv->ldb = provision_get_schema(priv, tctx->lp_ctx, NULL); torture_assert(tctx, priv->ldb, "Failed to load schema from disk"); priv->schema = dsdb_get_schema(priv->ldb, NULL); diff --git a/source4/libnet/libnet_vampire.c b/source4/libnet/libnet_vampire.c index 3b0b5a78b3..84fe2944e0 100644 --- a/source4/libnet/libnet_vampire.c +++ b/source4/libnet/libnet_vampire.c @@ -198,6 +198,7 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s struct dsdb_extended_replicated_objects *schema_objs_1, *schema_objs_2; struct repsFromTo1 *s_dsa; char *tmp_dns_name; + struct ldb_context *schema_ldb; struct ldb_message *msg; struct ldb_val prefixMap_val; struct ldb_message_element *prefixMap_el; @@ -252,6 +253,20 @@ static NTSTATUS libnet_vampire_cb_apply_schema(struct libnet_vampire_cb_state *s NT_STATUS_HAVE_NO_MEMORY(tmp_dns_name); s_dsa->other_info->dns_name = tmp_dns_name; + schema_ldb = provision_get_schema(s, s->lp_ctx, &s->prefixmap_blob); + if (!schema_ldb) { + DEBUG(0,("Failed to re-load from local provision using remote prefixMap. Will continue with local prefixMap\n")); + s->provision_schema = dsdb_get_schema(s->ldb, s); + } else { + s->provision_schema = dsdb_get_schema(schema_ldb, s); + ret = dsdb_reference_schema(s->ldb, s->provision_schema, false); + if (ret != LDB_SUCCESS) { + DEBUG(0,("Failed to attach schema from local provision using remote prefixMap.")); + return NT_STATUS_UNSUCCESSFUL; + } + talloc_free(schema_ldb); + } + s->provision_schema->relax_OID_conversions = true; /* Now convert the schema elements again, using the schema we just imported */ @@ -425,11 +440,19 @@ NTSTATUS libnet_vampire_cb_schema_chunk(void *private_data, if (!s->schema) { WERROR werr; + struct drsuapi_DsReplicaOIDMapping_Ctr mapping_ctr_without_schema_info; /* Put the DRS prefixmap aside for the schema we are * about to load in the provision, and into the one we * are making with the help of DRS */ - werr = dsdb_get_drsuapi_prefixmap_as_blob(mapping_ctr, s, &s->prefixmap_blob); + mapping_ctr_without_schema_info = *mapping_ctr; + + /* This strips off the 0xFF schema info from the end, + * because we don't want it in the blob */ + if (mapping_ctr_without_schema_info.num_mappings > 0) { + mapping_ctr_without_schema_info.num_mappings--; + } + werr = dsdb_get_drsuapi_prefixmap_as_blob(&mapping_ctr_without_schema_info, s, &s->prefixmap_blob); if (!W_ERROR_IS_OK(werr)) { return werror_to_ntstatus(werr); } diff --git a/source4/param/provision.c b/source4/param/provision.c index 28869e0a72..81c4fb16a5 100644 --- a/source4/param/provision.c +++ b/source4/param/provision.c @@ -339,7 +339,8 @@ failure: } -struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx) +struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, + DATA_BLOB *override_prefixmap) { const char *setupdir; PyObject *schema_mod, *schema_dict, *schema_fn, *py_result, *parameters; @@ -376,6 +377,11 @@ struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_co setupdir = lp_setupdir(lp_ctx); PyDict_SetItemString(parameters, "setup_dir", PyString_FromString(setupdir)); + if (override_prefixmap) { + PyDict_SetItemString(parameters, "override_prefixmap", + PyString_FromStringAndSize((const char *)override_prefixmap->data, + override_prefixmap->length)); + } py_result = PyEval_CallObjectWithKeywords(schema_fn, NULL, parameters); diff --git a/source4/param/provision.h b/source4/param/provision.h index 516a9dea5f..36758b9707 100644 --- a/source4/param/provision.h +++ b/source4/param/provision.h @@ -63,6 +63,7 @@ NTSTATUS provision_store_self_join(TALLOC_CTX *mem_ctx, struct loadparm_context struct provision_store_self_join_settings *settings, const char **error_string); -struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx); +struct ldb_context *provision_get_schema(TALLOC_CTX *mem_ctx, struct loadparm_context *lp_ctx, + DATA_BLOB *override_prefixmap); #endif /* _PROVISION_H_ */ diff --git a/source4/scripting/python/samba/schema.py b/source4/scripting/python/samba/schema.py index bdc09cfd3a..bffb0e53da 100644 --- a/source4/scripting/python/samba/schema.py +++ b/source4/scripting/python/samba/schema.py @@ -166,7 +166,8 @@ def get_dnsyntax_attributes(schemadn,schemaldb): def ldb_with_schema(setup_dir=None, schemadn="cn=schema,cn=configuration,dc=example,dc=com", serverdn="cn=server,cn=servers,cn=default-first-site-name,cn=sites,cn=cn=configuration,dc=example,dc=com", - domainsid=None): + domainsid=None, + override_prefixmap=None): """Load schema for the SamDB from the AD schema files and samba4_schema.ldif :param setup_dir: Setup path @@ -185,4 +186,4 @@ def ldb_with_schema(setup_dir=None, domainsid = security.random_sid() else: domainsid = security.dom_sid(domainsid) - return Schema(setup_path, domainsid, schemadn=schemadn, serverdn=serverdn) + return Schema(setup_path, domainsid, schemadn=schemadn, serverdn=serverdn, override_prefixmap=override_prefixmap) |