diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2016-07-09 16:51:56 +1200 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2016-07-19 13:41:11 +0200 |
| commit | da66a89bb4a1ef58a10a84f85ad35294605b9896 (patch) | |
| tree | f5d2995e84430076704bb31876c334f00b10ca76 /source4 | |
| parent | c48aef3c11716e3ecbf95c23cef0feebf98171e5 (diff) | |
| download | samba-da66a89bb4a1ef58a10a84f85ad35294605b9896.tar.gz | |
repl: Remove check for parentGUID being NULL in dsdb_convert_object_ex()
We find that Windows 2012R2 sends a NULL parent_guid here, probably when no change to name is replicated.
That is, if there has not been a rename, this is not required information, as we
can just merge with the existing object, not matter where it is
Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/dsdb/repl/replicated_objects.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/source4/dsdb/repl/replicated_objects.c b/source4/dsdb/repl/replicated_objects.c index 6d39dba4833..0c0aa8c2f00 100644 --- a/source4/dsdb/repl/replicated_objects.c +++ b/source4/dsdb/repl/replicated_objects.c @@ -574,11 +574,6 @@ WERROR dsdb_convert_object_ex(struct ldb_context *ldb, if (in->parent_object_guid == NULL) { out->parent_guid = NULL; - if ((instanceType & INSTANCE_TYPE_IS_NC_HEAD) == 0) { - DEBUG(0, ("Refusing to replicate %s from a server that did not provide a parentGUID!\n", - ldb_dn_get_linearized(msg->dn))); - return WERR_DS_DRA_INCONSISTENT_DIT; - } } else { out->parent_guid = talloc(mem_ctx, struct GUID); W_ERROR_HAVE_NO_MEMORY(out->parent_guid); |