summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-01-09 22:08:25 +1100
committerAndrew Tridgell <tridge@samba.org>2010-01-09 22:08:36 +1100
commitc03a101e6d410df68454f46c9e4d88f46fc2fa1a (patch)
treebbe3a9416841537d0c67d74b37017e30ade5cb96
parenta894eeab77bde6494d397e5f4cf2a4a1325b41a4 (diff)
downloadsamba-c03a101e6d410df68454f46c9e4d88f46fc2fa1a.tar.gz
samba-c03a101e6d410df68454f46c9e4d88f46fc2fa1a.tar.bz2
samba-c03a101e6d410df68454f46c9e4d88f46fc2fa1a.zip
s4-drs: instanceType is always sent, regardless of UDV values
-rw-r--r--source4/dsdb/samdb/ldb_modules/repl_meta_data.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 890eb91d6d..394ce3e637 100644
--- a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
+++ b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
@@ -2667,10 +2667,12 @@ static int replmd_replicated_apply_merge(struct replmd_replicated_request *ar)
break;
}
- DEBUG(1,("Discarding older DRS attribute update to %s on %s from %s\n",
- msg->elements[i-removed_attrs].name,
- ldb_dn_get_linearized(msg->dn),
- GUID_string(ar, &rmd->ctr.ctr1.array[i].originating_invocation_id)));
+ if (rmd->ctr.ctr1.array[i].attid != DRSUAPI_ATTRIBUTE_instanceType) {
+ DEBUG(1,("Discarding older DRS attribute update to %s on %s from %s\n",
+ msg->elements[i-removed_attrs].name,
+ ldb_dn_get_linearized(msg->dn),
+ GUID_string(ar, &rmd->ctr.ctr1.array[i].originating_invocation_id)));
+ }
/* we don't want to apply this change so remove the attribute */
ldb_msg_remove_element(msg, &msg->elements[i-removed_attrs]);