Merge branch 'master' of /home/tridge/samba/git/combined

[metze/samba/wip.git] / source4 / dsdb / repl / replicated_objects.c

diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c
index 4002ea8ae054f731135cce0fef6bf937d3eadf4d..2f4efc0fee947d019b954c81d096aa00658db7c0 100644 (file)
--- a/source4/dsdb/repl/replicated_objects.c
+++ b/source4/dsdb/repl/replicated_objects.c
@@ -150,9 +150,25 @@ static WERROR dsdb_convert_object_ex(struct ldb_context *ldb,
        }
 
        if (rdn_m) {
-               ret = ldb_msg_add_value(msg, rdn_attr->lDAPDisplayName, rdn_value, NULL);
-               if (ret != LDB_SUCCESS) {
-                       return WERR_FOOBAR;
+               struct ldb_message_element *el;
+               el = ldb_msg_find_element(msg, rdn_attr->lDAPDisplayName);
+               if (!el) {
+                       ret = ldb_msg_add_value(msg, rdn_attr->lDAPDisplayName, rdn_value, NULL);
+                       if (ret != LDB_SUCCESS) {
+                               return WERR_FOOBAR;
+                       }
+               } else {
+                       if (el->num_values != 1) {
+                               DEBUG(0,(__location__ ": Unexpected num_values=%u\n",
+                                        el->num_values));
+                               return WERR_FOOBAR;                             
+                       }
+                       if (!ldb_val_equal_exact(&el->values[0], rdn_value)) {
+                               DEBUG(0,(__location__ ": RDN value changed? '%*.*s' '%*.*s'\n",
+                                        (int)el->values[0].length, (int)el->values[0].length, el->values[0].data,
+                                        (int)rdn_value->length, (int)rdn_value->length, rdn_value->data));
+                               return WERR_FOOBAR;                             
+                       }
                }
 
                rdn_m->attid                            = rdn_attid;
@@ -243,7 +259,10 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
                status = dsdb_convert_object_ex(ldb, schema,
                                                cur, gensec_skey,
                                                out->objects, &out->objects[i]);
-               W_ERROR_NOT_OK_RETURN(status);
+               if (!W_ERROR_IS_OK(status)) {
+                       DEBUG(0,("Failed to convert object %s\n", cur->object.identifier->dn));
+                       return status;
+               }
        }
        if (i != out->num_objects) {
                return WERR_FOOBAR;
@@ -278,6 +297,11 @@ WERROR dsdb_extended_replicated_objects_commit(struct ldb_context *ldb,
                return WERR_FOOBAR;
        }
 
+       DEBUG(2,("Replicated %u objects (%u linked attributes) for %s\n",
+                out->num_objects, out->linked_attributes_count,
+                ldb_dn_get_linearized(out->partition_dn)));
+                
+
        if (_out) {
                *_out = out;
        } else {
@@ -316,19 +340,6 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb,
                                               msg->num_elements);
        W_ERROR_HAVE_NO_MEMORY(msg->elements);
 
-       /*
-        * TODO:
-        *
-        * The DsAddEntry() call which creates a nTDSDSA object,
-        * also adds a servicePrincipalName in the following form
-        * to the computer account of the new domain controller
-        * referenced by the "serverReferenece" attribute.
-        *
-        * E3514235-4B06-11D1-AB04-00C04FC2DCD2/<new-ntdsdsa-object-guid-as-string>/<domain-dns-name>
-        *
-        * also note that the "serverReference" isn't added to the new object!
-        */
-
        for (i=0; i < msg->num_elements; i++) {
                struct drsuapi_DsReplicaAttribute *a;
                struct ldb_message_element *e;
@@ -340,7 +351,9 @@ static WERROR dsdb_convert_object(struct ldb_context *ldb,
                W_ERROR_NOT_OK_RETURN(status);
        }
 
+
        *_msg = msg;
+
        return WERR_OK;
 }
 
@@ -393,11 +406,6 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
                           num_objects);
        W_ERROR_HAVE_NO_MEMORY(objects);
 
-       ret = ldb_transaction_start(ldb);
-       if (ret != 0) {
-               goto cancel;
-       }
-
        for (i=0; i < num_objects; i++) {
                struct dom_sid *sid = NULL;
                ret = ldb_add(ldb, objects[i]);
@@ -419,11 +427,6 @@ WERROR dsdb_origin_objects_commit(struct ldb_context *ldb,
                }
        }
 
-       ret = ldb_transaction_commit(ldb);
-       if (ret != 0) {
-               goto cancel;
-       }
-
        talloc_free(objects);
 
        *_num = num_objects;