From: Andrew Bartlett <abartlet@samba.org>
Date: Sat, 9 Jul 2016 04:51:56 +0000 (+1200)
Subject: repl: Remove check for parentGUID being NULL in dsdb_convert_object_ex()
X-Git-Tag: tdb-1.3.10~349
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=da66a89bb4a1ef58a10a84f85ad35294605b9896;p=thirdparty%2Fsamba.git

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>
---

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);