s4-dsdb: added new control DSDB_MODIFY_PARTIAL_REPLICA
[nivanova/samba-autobuild/.git] / source4 / dsdb / repl / replicated_objects.c
index 1efbd29d93baaaf8c4d793dc860c27e7500ac656..5ccf05255487213c7e3a76dec7a7a9b6743a1067 100644 (file)
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "dsdb/samdb/samdb.h"
-#include "lib/ldb/include/ldb_errors.h"
+#include <ldb_errors.h>
 #include "../lib/util/dlinklist.h"
 #include "librpc/gen_ndr/ndr_misc.h"
 #include "librpc/gen_ndr/ndr_drsuapi.h"
 #include "libcli/auth/libcli_auth.h"
 #include "param/param.h"
 
-static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
-                                    const struct dsdb_schema *schema,
-                                    const struct drsuapi_DsReplicaObjectListItemEx *in,
+/**
+ * Multi-pass working schema creation
+ * Function will:
+ *  - shallow copy initial schema supplied
+ *  - create a working schema in multiple passes
+ *    until all objects are resolved
+ * Working schema is a schema with Attributes, Classes
+ * and indexes, but w/o subClassOf, possibleSupperiors etc.
+ * It is to be used just us cache for converting attribute values.
+ */
+WERROR dsdb_repl_make_working_schema(struct ldb_context *ldb,
+                                    const struct dsdb_schema *initial_schema,
+                                    const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr,
+                                    uint32_t object_count,
+                                    const struct drsuapi_DsReplicaObjectListItemEx *first_object,
                                     const DATA_BLOB *gensec_skey,
                                     TALLOC_CTX *mem_ctx,
-                                    struct dsdb_extended_replicated_object *out)
+                                    struct dsdb_schema **_schema_out)
+{
+       struct schema_list {
+               struct schema_list *next, *prev;
+               const struct drsuapi_DsReplicaObjectListItemEx *obj;
+       };
+
+       WERROR werr;
+       struct dsdb_schema_prefixmap *pfm_remote;
+       struct schema_list *schema_list = NULL, *schema_list_item, *schema_list_next_item;
+       struct dsdb_schema *working_schema;
+       const struct drsuapi_DsReplicaObjectListItemEx *cur;
+       int ret, pass_no;
+       uint32_t ignore_attids[] = {
+                       DRSUAPI_ATTID_auxiliaryClass,
+                       DRSUAPI_ATTID_mayContain,
+                       DRSUAPI_ATTID_mustContain,
+                       DRSUAPI_ATTID_possSuperiors,
+                       DRSUAPI_ATTID_systemPossSuperiors,
+                       DRSUAPI_ATTID_INVALID
+       };
+
+       /* make a copy of the iniatial_scheam so we don't mess with it */
+       working_schema = dsdb_schema_copy_shallow(mem_ctx, ldb, initial_schema);
+       if (!working_schema) {
+               DEBUG(0,(__location__ ": schema copy failed!\n"));
+               return WERR_NOMEM;
+       }
+
+       /* we are going to need remote prefixMap for decoding */
+       werr = dsdb_schema_pfm_from_drsuapi_pfm(mapping_ctr, true,
+                                               mem_ctx, &pfm_remote, NULL);
+       if (!W_ERROR_IS_OK(werr)) {
+               DEBUG(0,(__location__ ": Failed to decode remote prefixMap: %s",
+                        win_errstr(werr)));
+               return werr;
+       }
+
+       /* create a list of objects yet to be converted */
+       for (cur = first_object; cur; cur = cur->next_object) {
+               schema_list_item = talloc(mem_ctx, struct schema_list);
+               schema_list_item->obj = cur;
+               DLIST_ADD_END(schema_list, schema_list_item, struct schema_list);
+       }
+
+       /* resolve objects until all are resolved and in local schema */
+       pass_no = 1;
+
+       while (schema_list) {
+               uint32_t converted_obj_count = 0;
+               uint32_t failed_obj_count = 0;
+               TALLOC_CTX *tmp_ctx = talloc_new(mem_ctx);
+               W_ERROR_HAVE_NO_MEMORY(tmp_ctx);
+
+               for (schema_list_item = schema_list; schema_list_item; schema_list_item=schema_list_next_item) {
+                       struct dsdb_extended_replicated_object object;
+
+                       cur = schema_list_item->obj;
+
+                       /* Save the next item, now we have saved out
+                        * the current one, so we can DLIST_REMOVE it
+                        * safely */
+                       schema_list_next_item = schema_list_item->next;
+
+                       /*
+                        * Convert the objects into LDB messages using the
+                        * schema we have so far. It's ok if we fail to convert
+                        * an object. We should convert more objects on next pass.
+                        */
+                       werr = dsdb_convert_object_ex(ldb, working_schema, pfm_remote,
+                                                     cur, gensec_skey,
+                                                     ignore_attids,
+                                                     0,
+                                                     tmp_ctx, &object);
+                       if (!W_ERROR_IS_OK(werr)) {
+                               DEBUG(4,("debug: Failed to convert schema object %s into ldb msg, will try during next loop\n",
+                                         cur->object.identifier->dn));
+
+                               failed_obj_count++;
+                       } else {
+                               /*
+                                * Convert the schema from ldb_message format
+                                * (OIDs as OID strings) into schema, using
+                                * the remote prefixMap
+                                */
+                               werr = dsdb_schema_set_el_from_ldb_msg(ldb,
+                                                                      working_schema,
+                                                                      object.msg);
+                               if (!W_ERROR_IS_OK(werr)) {
+                                       DEBUG(4,("debug: failed to convert object %s into a schema element, will try during next loop: %s\n",
+                                                ldb_dn_get_linearized(object.msg->dn),
+                                                win_errstr(werr)));
+                                       failed_obj_count++;
+                               } else {
+                                       DLIST_REMOVE(schema_list, schema_list_item);
+                                       talloc_free(schema_list_item);
+                                       converted_obj_count++;
+                               }
+                       }
+               }
+               talloc_free(tmp_ctx);
+
+               DEBUG(4,("Schema load pass %d: %d/%d of %d objects left to be converted.\n",
+                        pass_no, failed_obj_count, converted_obj_count, object_count));
+               pass_no++;
+
+               /* check if we converted any objects in this pass */
+               if (converted_obj_count == 0) {
+                       DEBUG(0,("Can't continue Schema load: didn't manage to convert any objects: all %d remaining of %d objects failed to convert\n", failed_obj_count, object_count));
+                       return WERR_INTERNAL_ERROR;
+               }
+
+               /* rebuild indexes */
+               ret = dsdb_setup_sorted_accessors(ldb, working_schema);
+               if (LDB_SUCCESS != ret) {
+                       DEBUG(0,("Failed to create schema-cache indexes!\n"));
+                       return WERR_INTERNAL_ERROR;
+               }
+       };
+
+       *_schema_out = working_schema;
+
+       return WERR_OK;
+}
+
+static bool dsdb_attid_in_list(const uint32_t attid_list[], uint32_t attid)
+{
+       const uint32_t *cur;
+       if (!attid_list) {
+               return false;
+       }
+       for (cur = attid_list; *cur != DRSUAPI_ATTID_INVALID; cur++) {
+               if (*cur == attid) {
+                       return true;
+               }
+       }
+       return false;
+}
+
+WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
+                             const struct dsdb_schema *schema,
+                             const struct dsdb_schema_prefixmap *pfm_remote,
+                             const struct drsuapi_DsReplicaObjectListItemEx *in,
+                             const DATA_BLOB *gensec_skey,
+                             const uint32_t *ignore_attids,
+                             uint32_t dsdb_repl_flags,
+                             TALLOC_CTX *mem_ctx,
+                             struct dsdb_extended_replicated_object *out)
 {
        NTSTATUS nt_status;
        WERROR status;
@@ -56,6 +215,7 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
        struct replPropertyMetaData1 *rdn_m = NULL;
        struct dom_sid *sid = NULL;
        uint32_t rid = 0;
+       uint32_t attr_count;
        int ret;
 
        if (!in->object.identifier) {
@@ -110,33 +270,30 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
                                               md->ctr.ctr1.count + 1); /* +1 because of the RDN attribute */
        W_ERROR_HAVE_NO_MEMORY(md->ctr.ctr1.array);
 
-       for (i=0; i < in->meta_data_ctr->count; i++) {
+       for (i=0, attr_count=0; i < in->meta_data_ctr->count; i++, attr_count++) {
                struct drsuapi_DsReplicaAttribute *a;
                struct drsuapi_DsReplicaMetaData *d;
                struct replPropertyMetaData1 *m;
                struct ldb_message_element *e;
-               int j;
+               uint32_t j;
 
                a = &in->object.attribute_ctr.attributes[i];
                d = &in->meta_data_ctr->meta_data[i];
-               m = &md->ctr.ctr1.array[i];
-               e = &msg->elements[i];
+               m = &md->ctr.ctr1.array[attr_count];
+               e = &msg->elements[attr_count];
+
+               if (dsdb_attid_in_list(ignore_attids, a->attid)) {
+                       attr_count--;
+                       continue;
+               }
 
                for (j=0; j<a->value_ctr.num_values; j++) {
                        status = drsuapi_decrypt_attribute(a->value_ctr.values[j].blob, gensec_skey, rid, a);
                        W_ERROR_NOT_OK_RETURN(status);
                }
 
-               status = dsdb_attribute_drsuapi_to_ldb(ldb, schema, a, msg->elements, e);
-               if (!NT_STATUS_IS_OK(status) && a->value_ctr.num_values == 0) {
-                       /* w2k8-r2 occasionally sends bogus empty
-                          attributes with rubbish attribute IDs. The
-                          only think we can do is discard these */
-                       DEBUG(0,(__location__ ": Discarding bogus empty DsReplicaAttribute with attid 0x%x\n",
-                                a->attid));
-                       ZERO_STRUCTP(e);
-                       continue;
-               }
+               status = dsdb_attribute_drsuapi_to_ldb(ldb, schema, pfm_remote,
+                                                      a, msg->elements, e);
                W_ERROR_NOT_OK_RETURN(status);
 
                m->attid                        = a->attid;
@@ -150,19 +307,16 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
                        whenChanged = d->originating_change_time;
                }
 
-               if (a->attid == DRSUAPI_ATTRIBUTE_name) {
+               if (a->attid == DRSUAPI_ATTID_name) {
                        name_a = a;
                        name_d = d;
-                       rdn_m = &md->ctr.ctr1.array[md->ctr.ctr1.count];
                }
        }
 
-       /* delete any empty elements */
-       for (i=0; i < msg->num_elements; i++) {
-               if (msg->elements[i].name == NULL) {
-                       ldb_msg_remove_element(msg, &msg->elements[i]);
-                       i--;
-               }
+       msg->num_elements = attr_count;
+       md->ctr.ctr1.count = attr_count;
+       if (name_a) {
+               rdn_m = &md->ctr.ctr1.array[md->ctr.ctr1.count];
        }
 
        if (rdn_m) {
@@ -197,6 +351,21 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
 
        }
 
+       if (dsdb_repl_flags & DSDB_REPL_FLAG_PARTIAL_REPLICA) {
+               /* the instanceType type for partial_replica
+                  replication is sent via DRS with TYPE_WRITE set, but
+                  must be used on the client with TYPE_WRITE removed
+               */
+               int instanceType = ldb_msg_find_attr_as_int(msg, "instanceType", 0);
+               if (instanceType & INSTANCE_TYPE_WRITE) {
+                       instanceType &= ~INSTANCE_TYPE_WRITE;
+                       ldb_msg_remove_attr(msg, "instanceType");
+                       if (ldb_msg_add_fmt(msg, "instanceType", "%d", instanceType) != LDB_SUCCESS) {
+                               return WERR_INTERNAL_ERROR;
+                       }
+               }
+       }
+
        whenChanged_t = nt_time_to_unix(whenChanged);
        whenChanged_s = ldb_timestring(msg, whenChanged_t);
        W_ERROR_HAVE_NO_MEMORY(whenChanged_s);
@@ -213,39 +382,67 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
        return WERR_OK;
 }
 
-WERROR dsdb_extended_replicated_objects_convert(struct ldb_context *ldb,
-                                               const char *partition_dn,
-                                               const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr,
-                                               uint32_t object_count,
-                                               const struct drsuapi_DsReplicaObjectListItemEx *first_object,
-                                               uint32_t linked_attributes_count,
-                                               const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes,
-                                               const struct repsFromTo1 *source_dsa,
-                                               const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector,
-                                               const DATA_BLOB *gensec_skey,
-                                               TALLOC_CTX *mem_ctx,
-                                               struct dsdb_extended_replicated_objects **objects)
+WERROR dsdb_replicated_objects_convert(struct ldb_context *ldb,
+                                      const struct dsdb_schema *schema,
+                                      const char *partition_dn_str,
+                                      const struct drsuapi_DsReplicaOIDMapping_Ctr *mapping_ctr,
+                                      uint32_t object_count,
+                                      const struct drsuapi_DsReplicaObjectListItemEx *first_object,
+                                      uint32_t linked_attributes_count,
+                                      const struct drsuapi_DsReplicaLinkedAttribute *linked_attributes,
+                                      const struct repsFromTo1 *source_dsa,
+                                      const struct drsuapi_DsReplicaCursor2CtrEx *uptodateness_vector,
+                                      const DATA_BLOB *gensec_skey,
+                                      uint32_t dsdb_repl_flags,
+                                      TALLOC_CTX *mem_ctx,
+                                      struct dsdb_extended_replicated_objects **objects)
 {
        WERROR status;
-       const struct dsdb_schema *schema;
+       struct ldb_dn *partition_dn;
+       struct dsdb_schema_prefixmap *pfm_remote;
        struct dsdb_extended_replicated_objects *out;
        const struct drsuapi_DsReplicaObjectListItemEx *cur;
        uint32_t i;
 
-       schema = dsdb_get_schema(ldb);
-       if (!schema) {
-               return WERR_DS_SCHEMA_NOT_LOADED;
-       }
-
-       status = dsdb_schema_pfm_contains_drsuapi_pfm(schema->prefixmap, mapping_ctr);
-       W_ERROR_NOT_OK_RETURN(status);
-
        out = talloc_zero(mem_ctx, struct dsdb_extended_replicated_objects);
        W_ERROR_HAVE_NO_MEMORY(out);
        out->version            = DSDB_EXTENDED_REPLICATED_OBJECTS_VERSION;
+       out->dsdb_repl_flags    = dsdb_repl_flags;
+
+       /*
+        * Ensure schema is kept valid for as long as 'out'
+        * which may contain pointers to it
+        */
+       schema = talloc_reference(out, schema);
+       W_ERROR_HAVE_NO_MEMORY(schema);
+
+       partition_dn = ldb_dn_new(out, ldb, partition_dn_str);
+       W_ERROR_HAVE_NO_MEMORY_AND_FREE(partition_dn, out);
+
+       status = dsdb_schema_pfm_from_drsuapi_pfm(mapping_ctr, true,
+                                                 out, &pfm_remote, NULL);
+       if (!W_ERROR_IS_OK(status)) {
+               DEBUG(0,(__location__ ": Failed to decode remote prefixMap: %s",
+                        win_errstr(status)));
+               talloc_free(out);
+               return status;
+       }
+
+       if (ldb_dn_compare(partition_dn, ldb_get_schema_basedn(ldb)) != 0) {
+               /*
+                * check for schema changes in case
+                * we are not replicating Schema NC
+                */
+               status = dsdb_schema_info_cmp(schema, mapping_ctr);
+               if (!W_ERROR_IS_OK(status)) {
+                       DEBUG(1,("Remote schema has changed while replicating %s\n",
+                                partition_dn_str));
+                       talloc_free(out);
+                       return status;
+               }
+       }
 
-       out->partition_dn       = ldb_dn_new(out, ldb, partition_dn);
-       W_ERROR_HAVE_NO_MEMORY(out->partition_dn);
+       out->partition_dn       = partition_dn;
 
        out->source_dsa         = source_dsa;
        out->uptodateness_vector= uptodateness_vector;
@@ -254,7 +451,7 @@ WERROR dsdb_extended_replicated_objects_convert(struct ldb_context *ldb,
        out->objects            = talloc_array(out,
                                               struct dsdb_extended_replicated_object,
                                               out->num_objects);
-       W_ERROR_HAVE_NO_MEMORY(out->objects);
+       W_ERROR_HAVE_NO_MEMORY_AND_FREE(out->objects, out);
 
        /* pass the linked attributes down to the repl_meta_data
           module */
@@ -263,30 +460,50 @@ WERROR dsdb_extended_replicated_objects_convert(struct ldb_context *ldb,
 
        for (i=0, cur = first_object; cur; cur = cur->next_object, i++) {
                if (i == out->num_objects) {
+                       talloc_free(out);
                        return WERR_FOOBAR;
                }
 
-               status = dsdb_convert_object_ex(ldb, schema,
+               status = dsdb_convert_object_ex(ldb, schema, pfm_remote,
                                                cur, gensec_skey,
+                                               NULL,
+                                               dsdb_repl_flags,
                                                out->objects, &out->objects[i]);
                if (!W_ERROR_IS_OK(status)) {
-                       DEBUG(0,("Failed to convert object %s\n", cur->object.identifier->dn));
+                       talloc_free(out);
+                       DEBUG(0,("Failed to convert object %s: %s\n",
+                                cur->object.identifier->dn,
+                                win_errstr(status)));
                        return status;
                }
        }
        if (i != out->num_objects) {
+               talloc_free(out);
                return WERR_FOOBAR;
        }
 
+       /* free pfm_remote, we won't need it anymore */
+       talloc_free(pfm_remote);
+
        *objects = out;
        return WERR_OK;
 }
 
-WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
-                                              struct dsdb_extended_replicated_objects *objects,
-                                              uint64_t *notify_uSN)
+/**
+ * Commits a list of replicated objects.
+ *
+ * @param working_schema dsdb_schema to be used for resolving
+ *                      Classes/Attributes during Schema replication. If not NULL,
+ *                      it will be set on ldb and used while committing replicated objects
+ */
+WERROR dsdb_replicated_objects_commit(struct ldb_context *ldb,
+                                     struct dsdb_schema *working_schema,
+                                     struct dsdb_extended_replicated_objects *objects,
+                                     uint64_t *notify_uSN)
 {
+       WERROR werr;
        struct ldb_result *ext_res;
+       struct dsdb_schema *cur_schema = NULL;
        int ret;
        uint64_t seq_num1, seq_num2;
 
@@ -301,15 +518,41 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
                return WERR_FOOBAR;
        }
 
-       ret = dsdb_load_partition_usn(ldb, objects->partition_dn, &seq_num1);
+       ret = dsdb_load_partition_usn(ldb, objects->partition_dn, &seq_num1, NULL);
        if (ret != LDB_SUCCESS) {
                DEBUG(0,(__location__ " Failed to load partition uSN\n"));
                ldb_transaction_cancel(ldb);
                return WERR_FOOBAR;             
        }
 
+       /*
+        * Set working_schema for ldb in case we are replicating from Schema NC.
+        * Schema won't be reloaded during Replicated Objects commit, as it is
+        * done in a transaction. So we need some way to search for newly
+        * added Classes and Attributes
+        */
+       if (working_schema) {
+               /* store current schema so we can fall back in case of failure */
+               cur_schema = dsdb_get_schema(ldb, working_schema);
+
+               ret = dsdb_reference_schema(ldb, working_schema, false);
+               if (ret != LDB_SUCCESS) {
+                       DEBUG(0,(__location__ "Failed to reference working schema - %s\n",
+                                ldb_strerror(ret)));
+                       /* TODO: Map LDB Error to NTSTATUS? */
+                       ldb_transaction_cancel(ldb);
+                       return WERR_INTERNAL_ERROR;
+               }
+       }
+
        ret = ldb_extended(ldb, DSDB_EXTENDED_REPLICATED_OBJECTS_OID, objects, &ext_res);
        if (ret != LDB_SUCCESS) {
+               /* restore previous schema */
+               if (cur_schema ) {
+                       dsdb_reference_schema(ldb, cur_schema, false);
+                       dsdb_make_schema_global(ldb, cur_schema);
+               }
+
                DEBUG(0,("Failed to apply records: %s: %s\n",
                         ldb_errstring(ldb), ldb_strerror(ret)));
                ldb_transaction_cancel(ldb);
@@ -317,14 +560,42 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
        }
        talloc_free(ext_res);
 
+       /* Save our updated prefixMap */
+       if (working_schema) {
+               werr = dsdb_write_prefixes_from_schema_to_ldb(working_schema,
+                                                             ldb,
+                                                             working_schema);
+               if (!W_ERROR_IS_OK(werr)) {
+                       /* restore previous schema */
+                       if (cur_schema ) {
+                               dsdb_reference_schema(ldb, cur_schema, false);
+                               dsdb_make_schema_global(ldb, cur_schema);
+                       }
+                       DEBUG(0,("Failed to save updated prefixMap: %s\n",
+                                win_errstr(werr)));
+                       return werr;
+               }
+       }
+
        ret = ldb_transaction_prepare_commit(ldb);
        if (ret != LDB_SUCCESS) {
-               DEBUG(0,(__location__ " Failed to prepare commit of transaction\n"));
+               /* restore previous schema */
+               if (cur_schema ) {
+                       dsdb_reference_schema(ldb, cur_schema, false);
+                       dsdb_make_schema_global(ldb, cur_schema);
+               }
+               DEBUG(0,(__location__ " Failed to prepare commit of transaction: %s\n",
+                        ldb_errstring(ldb)));
                return WERR_FOOBAR;
        }
 
-       ret = dsdb_load_partition_usn(ldb, objects->partition_dn, &seq_num2);
+       ret = dsdb_load_partition_usn(ldb, objects->partition_dn, &seq_num2, NULL);
        if (ret != LDB_SUCCESS) {
+               /* restore previous schema */
+               if (cur_schema ) {
+                       dsdb_reference_schema(ldb, cur_schema, false);
+                       dsdb_make_schema_global(ldb, cur_schema);
+               }
                DEBUG(0,(__location__ " Failed to load partition uSN\n"));
                ldb_transaction_cancel(ldb);
                return WERR_FOOBAR;             
@@ -339,10 +610,27 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
 
        ret = ldb_transaction_commit(ldb);
        if (ret != LDB_SUCCESS) {
+               /* restore previous schema */
+               if (cur_schema ) {
+                       dsdb_reference_schema(ldb, cur_schema, false);
+                       dsdb_make_schema_global(ldb, cur_schema);
+               }
                DEBUG(0,(__location__ " Failed to commit transaction\n"));
                return WERR_FOOBAR;
        }
 
+       /*
+        * Reset the Schema used by ldb. This will lead to
+        * a schema cache being refreshed from database.
+        */
+       if (working_schema) {
+               cur_schema = dsdb_get_schema(ldb, NULL);
+               /* TODO: What we do in case dsdb_get_schema() fail?
+                *       We can't fallback at this point anymore */
+               if (cur_schema) {
+                       dsdb_make_schema_global(ldb, cur_schema);
+               }
+       }
 
        DEBUG(2,("Replicated %u objects (%u linked attributes) for %s\n",
                 objects->num_objects, objects->linked_attributes_count,
@@ -351,14 +639,14 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
        return WERR_OK;
 }
 
-static WERROR dsdb_convert_object(struct ldb_context *ldb,
-                                 const struct dsdb_schema *schema,
-                                 const struct drsuapi_DsReplicaObjectListItem *in,
-                                 TALLOC_CTX *mem_ctx,
-                                 struct ldb_message **_msg)
+static WERROR dsdb_origin_object_convert(struct ldb_context *ldb,
+                                        const struct dsdb_schema *schema,
+                                        const struct drsuapi_DsReplicaObjectListItem *in,
+                                        TALLOC_CTX *mem_ctx,
+                                        struct ldb_message **_msg)
 {
        WERROR status;
-       uint32_t i;
+       unsigned int i;
        struct ldb_message *msg;
 
        if (!in->object.identifier) {
@@ -387,7 +675,8 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb,
                a = &in->object.attribute_ctr.attributes[i];
                e = &msg->elements[i];
 
-               status = dsdb_attribute_drsuapi_to_ldb(ldb, schema, a, msg->elements, e);
+               status = dsdb_attribute_drsuapi_to_ldb(ldb, schema, schema->prefixmap,
+                                                      a, msg->elements, e);
                W_ERROR_NOT_OK_RETURN(status);
        }
 
@@ -401,6 +690,7 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
                                  TALLOC_CTX *mem_ctx,
                                  const struct drsuapi_DsReplicaObjectListItem *first_object,
                                  uint32_t *_num,
+                                 uint32_t dsdb_repl_flags,
                                  struct drsuapi_DsReplicaObjectIdentifier2 **_ids)
 {
        WERROR status;
@@ -418,11 +708,6 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
        struct ldb_result *res;
        int ret;
 
-       schema = dsdb_get_schema(ldb);
-       if (!schema) {
-               return WERR_DS_SCHEMA_NOT_LOADED;
-       }
-
        for (cur = first_object; cur; cur = cur->next_object) {
                num_objects++;
        }
@@ -443,9 +728,14 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
                goto cancel;
        }
 
+       schema = dsdb_get_schema(ldb, objects);
+       if (!schema) {
+               return WERR_DS_SCHEMA_NOT_LOADED;
+       }
+
        for (i=0, cur = first_object; cur; cur = cur->next_object, i++) {
-               status = dsdb_convert_object(ldb, schema,
-                                            cur, objects, &objects[i]);
+               status = dsdb_origin_object_convert(ldb, schema, cur,
+                                                   objects, &objects[i]);
                if (!W_ERROR_IS_OK(status)) {
                        goto cancel;
                }
@@ -459,6 +749,32 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
                goto cancel;
        }
 
+       if (dsdb_repl_flags & DSDB_REPL_FLAG_ADD_NCNAME) {
+               /* check for possible NC creation */
+               for (i=0; i < num_objects; i++) {
+                       struct ldb_message *msg = objects[i];
+                       struct ldb_message_element *el;
+                       struct ldb_dn *nc_dn;
+
+                       if (ldb_msg_check_string_attribute(msg, "objectClass", "crossRef") == 0) {
+                               continue;
+                       }
+                       el = ldb_msg_find_element(msg, "nCName");
+                       if (el == NULL || el->num_values != 1) {
+                               continue;
+                       }
+                       nc_dn = ldb_dn_from_ldb_val(objects, ldb, &el->values[0]);
+                       if (!ldb_dn_validate(nc_dn)) {
+                               continue;
+                       }
+                       ret = dsdb_create_partial_replica_NC(ldb, nc_dn);
+                       if (ret != LDB_SUCCESS) {
+                               status = WERR_DS_INTERNAL_FAILURE;
+                               goto cancel;
+                       }
+               }
+       }
+
        for (i=0; i < num_objects; i++) {
                struct dom_sid *sid = NULL;
                struct ldb_request *add_req;