repl: Remove check for parentGUID being NULL in dsdb_convert_object_ex()
authorAndrew Bartlett <abartlet@samba.org>
Sat, 9 Jul 2016 04:51:56 +0000 (16:51 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 19 Jul 2016 11:41:11 +0000 (13:41 +0200)
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>
source4/dsdb/repl/replicated_objects.c

index 6d39dba4833d1858f7b6b227512de20076a46678..0c0aa8c2f003797a88fa0ca838f681392c21de7f 100644 (file)
@@ -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);