The branch, master has been updated
via c03a101... s4-drs: instanceType is always sent, regardless of UDV
values
from a894eea... s4-debug: lower the verbosity of a couple of common log
messages
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit c03a101e6d410df68454f46c9e4d88f46fc2fa1a
Author: Andrew Tridgell <[email protected]>
Date: Sat Jan 9 22:08:25 2010 +1100
s4-drs: instanceType is always sent, regardless of UDV values
-----------------------------------------------------------------------
Summary of changes:
source4/dsdb/samdb/ldb_modules/repl_meta_data.c | 10 ++++++----
1 files changed, 6 insertions(+), 4 deletions(-)
Changeset truncated at 500 lines:
diff --git a/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
b/source4/dsdb/samdb/ldb_modules/repl_meta_data.c
index 890eb91..394ce3e 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]);
--
Samba Shared Repository
