s4-drs: When comparing DN, check the DN itself and its extra bits if present

author Matthieu Patou <mat@matws.net>

Wed, 3 Oct 2012 08:35:13 +0000 (01:35 -0700)

committer Matthieu Patou <mat@matws.net>

Sun, 18 May 2014 04:51:15 +0000 (21:51 -0700)
author Matthieu Patou <mat@matws.net>
Wed, 3 Oct 2012 08:35:13 +0000 (01:35 -0700)
committer Matthieu Patou <mat@matws.net>
Sun, 18 May 2014 04:51:15 +0000 (21:51 -0700)
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c

index 83dabdfdf3b1195e9174a14e4b44240a197fbef3..ad703286eecf69008e032e1a4fe773480e6651d1 100644 (file)
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -1613,7 +1613,8 @@ static int parsed_dn_compare(struct parsed_dn *pdn1, struct parsed_dn *pdn2)
  
  static struct parsed_dn *parsed_dn_find(struct parsed_dn *pdn,
                                         unsigned int count, struct GUID *guid,
-                                       struct ldb_dn *dn)
+                                       struct ldb_dn *dn,
+                                       DATA_BLOB extra)
  {
         struct parsed_dn *ret;
         unsigned int i;
@@ -1629,6 +1630,18 @@ static struct parsed_dn *parsed_dn_find(struct parsed_dn *pdn,
                 return NULL;
         }
         BINARY_ARRAY_SEARCH(pdn, count, guid, guid, GUID_compare, ret);
+       if (extra.length && ret) {
+               /*
+                * Check the content of the extra it's a match only
+                * if the dn match but also the extra.
+                */
+               if (ret->dsdb_dn->extra_part.length != extra.length) {
+                       return NULL;
+               }
+               if (memcmp(ret->dsdb_dn->extra_part.data, extra.data, extra.length) != 0) {
+                       return NULL;
+               }
+       }
         return ret;
  }
  
@@ -1979,7 +1992,9 @@ static int replmd_modify_la_add(struct ldb_module *module,
  
         /* for each new value, see if it exists already with the same GUID */
         for (i=0; i<el->num_values; i++) {
-               struct parsed_dn *p = parsed_dn_find(old_dns, old_num_values, dns[i].guid, NULL);
+               struct parsed_dn *p = parsed_dn_find(old_dns, old_num_values,
+                                                    dns[i].guid, NULL,
+                                                    dns[i].dsdb_dn->extra_part);
                 if (p == NULL) {
                         /* this is a new linked attribute value */
                         new_values = talloc_realloc(tmp_ctx, new_values, struct ldb_val, num_new_values+1);
@@ -2118,7 +2133,8 @@ static int replmd_modify_la_delete(struct ldb_module *module,
                 struct parsed_dn *p2;
                 uint32_t rmd_flags;
  
-               p2 = parsed_dn_find(old_dns, old_el->num_values, p->guid, NULL);
+               p2 = parsed_dn_find(old_dns, old_el->num_values, p->guid, NULL,
+                                   p->dsdb_dn->extra_part);
                 if (!p2) {
                         ldb_asprintf_errstring(ldb, "Attribute %s doesn't exist for target GUID %s",
                                                el->name, GUID_string(tmp_ctx, p->guid));
@@ -2147,7 +2163,9 @@ static int replmd_modify_la_delete(struct ldb_module *module,
                 struct parsed_dn *p = &old_dns[i];
                 uint32_t rmd_flags;
  
-               if (el->num_values && parsed_dn_find(dns, el->num_values, p->guid, NULL) == NULL) {
+               if (el->num_values && parsed_dn_find(dns, el->num_values,
+                                                    p->guid, NULL,
+                                                    p->dsdb_dn->extra_part) == NULL) {
                         continue;
                 }
  
@@ -2250,7 +2268,8 @@ static int replmd_modify_la_replace(struct ldb_module *module,
                         return ret;
                 }
  
-               p = parsed_dn_find(dns, el->num_values, old_p->guid, NULL);
+               p = parsed_dn_find(dns, el->num_values, old_p->guid, NULL,
+                                  old_p->dsdb_dn->extra_part);
                 if (p) {
                         /* we don't delete it if we are re-adding it */
                         continue;
@@ -2272,7 +2291,8 @@ static int replmd_modify_la_replace(struct ldb_module *module,
  
                 if (old_dns &&
                     (old_p = parsed_dn_find(old_dns,
-                                           old_num_values, p->guid, NULL)) != NULL) {
+                                           old_num_values, p->guid, NULL,
+                                           p->dsdb_dn->extra_part)) != NULL) {
                         /* update in place */
                         ret = replmd_update_la_val(old_el->values, old_p->v, p->dsdb_dn,
                                                    old_p->dsdb_dn, invocation_id,
@@ -5585,7 +5605,8 @@ linked_attributes[0]:
         }
  
         /* see if this link already exists */
-       pdn = parsed_dn_find(pdn_list, old_el->num_values, &guid, dsdb_dn->dn);
+       pdn = parsed_dn_find(pdn_list, old_el->num_values, &guid, dsdb_dn->dn,
+                            dsdb_dn->extra_part);
         if (pdn != NULL) {
                 /* see if this update is newer than what we have already */
                 struct GUID invocation_id = GUID_zero();
author	Matthieu Patou <mat@matws.net>
	Wed, 3 Oct 2012 08:35:13 +0000 (01:35 -0700)
committer	Matthieu Patou <mat@matws.net>
	Sun, 18 May 2014 04:51:15 +0000 (21:51 -0700)