r21282: we only need one for loop...

metze
(This used to be commit 181b3a031f9683ea5e9aa2c96f121639561c6830)

diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 9f6ce4c519b2024d7bb71dd293db8ce99f2bd8a5..08a349d1c3ec0421d05753a2e6efe6e1206e7df2 100644 (file)
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -88,13 +88,6 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb,
                                               msg->num_elements);
        W_ERROR_HAVE_NO_MEMORY(msg->elements);
 
-       for (i=0; i < msg->num_elements; i++) {
-               status = dsdb_attribute_drsuapi_to_ldb(schema,
-                                                      &in->object.attribute_ctr.attributes[i],
-                                                      msg->elements, &msg->elements[i]);
-               W_ERROR_NOT_OK_RETURN(status);
-       }
-
        md = talloc(mem_ctx, struct replPropertyMetaDataBlob);
        W_ERROR_HAVE_NO_MEMORY(md);
 
@@ -111,10 +104,15 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb,
                struct drsuapi_DsReplicaAttribute *a;
                struct drsuapi_DsReplicaMetaData *d;
                struct replPropertyMetaData1 *m;
+               struct ldb_message_element *e;
 
                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];
+
+               status = dsdb_attribute_drsuapi_to_ldb(schema, a, msg->elements, e);
+               W_ERROR_NOT_OK_RETURN(status);
 
                m->attid                        = a->attid;
                m->version                      = d->version;